clippy

Author: Heliozoa

tmc-langs-cli/src/main.rs

@@ -752,8 +752,8 @@ fn into_usize(arg: &str) -> Result<usize> {
 
 fn into_locale(arg: &str) -> Result<Language> {
     Language::from_locale(arg)
-        .or(Language::from_639_1(arg))
-        .or(Language::from_639_3(arg))
+        .or_else(|| Language::from_639_1(arg))
+        .or_else(|| Language::from_639_3(arg))
         .with_context(|| format!("Invalid locale: {}", arg))
 }
 

tmc-langs-core/src/tmc_core/api.rs

@@ -31,14 +31,14 @@ trait CoreExt {
 impl CoreExt for ReqwestResponse {
     #[cfg(not(test))]
     fn json_res<T: DeserializeOwned>(self) -> Result<T> {
-        let res: Response<T> = self.json().map_err(|e| CoreError::HttpJsonResponse(e))?;
+        let res: Response<T> = self.json().map_err(CoreError::HttpJsonResponse)?;
         res.into_result()
     }
 
     // logs received JSON for easier debugging in tests
     #[cfg(test)]
     fn json_res<T: DeserializeOwned>(self) -> Result<T> {
-        let res: Value = self.json().map_err(|e| CoreError::HttpJsonResponse(e))?;
+        let res: Value = self.json().map_err(CoreError::HttpJsonResponse)?;
         log::debug!("JSON {}", res);
         let res: Response<T> = serde_json::from_value(res).unwrap();
         res.into_result()
@@ -49,7 +49,7 @@ impl CoreExt for ReqwestResponse {
         if status.is_success() {
             Ok(self)
         } else {
-            let text = self.text().unwrap_or(String::new());
+            let text = self.text().unwrap_or_default();
             Err(CoreError::HttpStatus(url, status, text))
         }
     }

tmc-langs-csharp/src/plugin.rs

@@ -24,6 +24,7 @@ use zip::ZipArchive;
 
 const TMC_CSHARP_RUNNER: &[u8] = include_bytes!("../tmc-csharp-runner-1.0.1.zip");
 
+#[derive(Default)]
 pub struct CSharpPlugin {}
 
 impl CSharpPlugin {
@@ -35,8 +36,7 @@ impl CSharpPlugin {
     fn extract_runner(target: &Path) -> Result<(), CSharpError> {
         log::debug!("extracting C# runner to {}", target.display());
 
-        let mut zip =
-            ZipArchive::new(Cursor::new(TMC_CSHARP_RUNNER)).map_err(|e| CSharpError::Zip(e))?;
+        let mut zip = ZipArchive::new(Cursor::new(TMC_CSHARP_RUNNER)).map_err(CSharpError::Zip)?;
         for i in 0..zip.len() {
             let file = zip.by_index(i).unwrap();
             if file.is_file() {
@@ -85,7 +85,7 @@ impl CSharpPlugin {
                 log::debug!("found boostrap dll at {}", bootstrap.display());
                 Ok(bootstrap)
             } else {
-                Err(CSharpError::MissingBootstrapDll(bootstrap).into())
+                Err(CSharpError::MissingBootstrapDll(bootstrap))
             }
         }
     }

tmc-langs-framework/src/lib.rs

@@ -34,7 +34,7 @@ impl CommandWithTimeout<'_> {
                     .map_err(|e| TmcError::CommandSpawn(name, e))?;
                 let timer = Instant::now();
                 loop {
-                    match child.try_wait().map_err(|e| TmcError::Process(e))? {
+                    match child.try_wait().map_err(TmcError::Process)? {
                         Some(_exit_status) => {
                             // done, get output
                             return child
@@ -44,7 +44,7 @@ impl CommandWithTimeout<'_> {
                         None => {
                             // still running, check timeout
                             if timer.elapsed() > timeout {
-                                child.kill().map_err(|e| TmcError::Process(e))?;
+                                child.kill().map_err(TmcError::Process)?;
                                 return Err(TmcError::TestTimeout(timer.elapsed()));
                             }
 

tmc-langs-notests/src/lib.rs

@@ -23,7 +23,7 @@ impl NoTestsPlugin {
             .get_tmc_project_yml()
             .ok()
             .and_then(|c| c.no_tests.map(|n| n.points))
-            .unwrap_or(vec![])
+            .unwrap_or_default()
     }
 }
 

tmc-langs-r/src/plugin.rs

@@ -16,6 +16,7 @@ use std::path::Path;
 use std::process::Command;
 use std::time::Duration;
 
+#[derive(Default)]
 pub struct RPlugin {}
 
 impl RPlugin {

tmc-langs-util/src/tar.rs

@@ -28,13 +28,13 @@ pub fn create_tar_from_project(
     let project_name = Path::new(
         project_dir
             .file_name()
-            .ok_or(TmcError::NoFileName(project_dir.to_path_buf()))?,
+            .ok_or_else(|| TmcError::NoFileName(project_dir.to_path_buf()))?,
     );
     let root = project_dir.parent().unwrap_or_else(|| Path::new(""));
     add_dir_to_project(&mut tar, &project_dir, project_dir, &project_name)?;
     add_dir_to_project(&mut tar, &tmc_langs, root, &project_name)?;
     add_dir_to_project(&mut tar, &tmcrun, root, &project_name)?;
-    tar.finish().map_err(|e| TmcError::TarFinish(e))?;
+    tar.finish().map_err(TmcError::TarFinish)?;
     Ok(())
 }
 
@@ -51,7 +51,7 @@ fn add_dir_to_project<W: Write>(
             let path_in_tar: PathBuf = project_name.join(path_in_project);
             log::trace!("appending {:?} as {:?}", entry.path(), path_in_tar);
             tar.append_path_with_name(entry.path(), path_in_tar)
-                .map_err(|e| TmcError::TarAppend(e))?;
+                .map_err(TmcError::TarAppend)?;
         }
     }
     Ok(())