rust: fix clippy warnings

Author: rizsotto

rust/bear/src/bin/wrapper.rs

@@ -87,7 +87,7 @@ fn next_in_path(target: &Path) -> Result<PathBuf> {
         .map(|dir| Path::new(dir).join(target))
         // FIXME: check if it is executable
         .filter(|path| path.is_file())
-        .filter(|path| {
+        .find(|path| {
             // We need to compare it with the real path of the candidate executable to avoid
             // calling the same executable again.
             let real_path = match path.canonicalize() {
@@ -96,7 +96,6 @@ fn next_in_path(target: &Path) -> Result<PathBuf> {
             };
             real_path != current_exe
         })
-        .next()
         .ok_or_else(|| anyhow::anyhow!("Cannot find the real executable"))
 }
 

rust/bear/src/ipc/tcp.rs

@@ -57,7 +57,7 @@ impl Envelope {
 
 /// Implements convenient methods for the `ReporterId` type.
 impl ReporterId {
-    pub fn new() -> Self {
+    pub fn generate() -> Self {
         let id = random::<u64>();
         ReporterId(id)
     }
@@ -160,7 +160,7 @@ impl ReporterOnTcp {
     /// It does not open the TCP connection yet. Stores the destination
     /// address and creates a unique reporter id.
     pub fn new(destination: String) -> Result<Self, anyhow::Error> {
-        let reporter_id = ReporterId::new();
+        let reporter_id = ReporterId::generate();
         let result = ReporterOnTcp {
             destination,
             reporter_id,
@@ -265,7 +265,7 @@ mod tests {
             std::sync::LazyLock::new(|| {
                 vec![
                     Envelope {
-                        rid: ReporterId::new(),
+                        rid: ReporterId::generate(),
                         timestamp: timestamp(),
                         event: Event {
                             pid: pid(),
@@ -278,7 +278,7 @@ mod tests {
                         },
                     },
                     Envelope {
-                        rid: ReporterId::new(),
+                        rid: ReporterId::generate(),
                         timestamp: timestamp(),
                         event: Event {
                             pid: pid(),
@@ -300,7 +300,7 @@ mod tests {
                         },
                     },
                     Envelope {
-                        rid: ReporterId::new(),
+                        rid: ReporterId::generate(),
                         timestamp: timestamp(),
                         event: Event {
                             pid: pid(),

rust/bear/src/output/mod.rs

@@ -132,8 +132,9 @@ impl config::Format {
         } else {
             clang::write_with_command
         };
-        let result = method(writer, entries)?;
-        Ok(result)
+        method(writer, entries)?;
+
+        Ok(())
     }
 
     /// Convert the compiler calls into entries.
@@ -182,7 +183,7 @@ impl config::Format {
                     file: into_fully_qualified_path(source.clone(), working_dir)?,
                     directory: working_dir.to_path_buf(),
                     output: self.try_convert_to_output(output, working_dir)?,
-                    arguments: Self::try_convert_into_arguments(&compiler, source, output, flags)?,
+                    arguments: Self::try_convert_into_arguments(compiler, source, output, flags)?,
                 };
                 Ok(entry)
             }

rust/bear/src/semantic/interpreters/combinators.rs

@@ -10,8 +10,8 @@ pub(super) struct Any {
 }
 
 impl Any {
-    pub(super) fn new(tools: Vec<Box<dyn Interpreter>>) -> impl Interpreter {
-        Any {
+    pub(super) fn new(tools: Vec<Box<dyn Interpreter>>) -> Self {
+        Self {
             interpreters: tools,
         }
     }

rust/bear/src/semantic/interpreters/gcc.rs

@@ -10,8 +10,8 @@ use internal::Argument;
 pub(super) struct Gcc {}
 
 impl Gcc {
-    pub(super) fn new() -> Box<dyn Interpreter> {
-        Box::new(Gcc {})
+    pub(super) fn new() -> Self {
+        Gcc {}
     }
 }
 

rust/bear/src/semantic/interpreters/generic.rs

@@ -13,9 +13,9 @@ pub(super) struct Generic {
 }
 
 impl Generic {
-    pub(super) fn from(compilers: &[PathBuf]) -> Box<dyn Interpreter> {
+    pub(super) fn from(compilers: &[PathBuf]) -> Self {
         let executables = compilers.iter().cloned().collect();
-        Box::new(Self { executables })
+        Self { executables }
     }
 }
 

rust/bear/src/semantic/interpreters/ignore.rs

@@ -11,14 +11,14 @@ pub(super) struct IgnoreByPath {
 }
 
 impl IgnoreByPath {
-    pub(super) fn new() -> Box<dyn Interpreter> {
+    pub(super) fn new() -> Self {
         let executables = COREUTILS_FILES.iter().map(PathBuf::from).collect();
-        Box::new(Self { executables })
+        Self { executables }
     }
 
-    pub(super) fn from(compilers: &[PathBuf]) -> Box<dyn Interpreter> {
+    pub(super) fn from(compilers: &[PathBuf]) -> Self {
         let executables = compilers.iter().cloned().collect();
-        Box::new(Self { executables })
+        Self { executables }
     }
 }
 

rust/bear/src/semantic/interpreters/mod.rs

@@ -26,9 +26,9 @@ impl Builder {
         Builder {
             interpreters: vec![
                 // ignore executables which are not compilers,
-                IgnoreByPath::new(),
+                Box::new(IgnoreByPath::new()),
                 // recognize default compiler
-                Generic::from(&[PathBuf::from("/usr/bin/g++")]),
+                Box::new(Generic::from(&[PathBuf::from("/usr/bin/g++")])),
             ],
         }
     }
@@ -43,7 +43,7 @@ impl Builder {
         if !compilers.is_empty() {
             // Add the new compilers at the end of the interpreters.
             let tool = Generic::from(compilers);
-            self.interpreters.push(tool);
+            self.interpreters.push(Box::new(tool));
         }
         self
     }
@@ -53,12 +53,18 @@ impl Builder {
         if !compilers.is_empty() {
             // Add these new compilers at the front of the interpreters.
             let tool = IgnoreByPath::from(compilers);
-            self.interpreters.insert(0, tool);
+            self.interpreters.insert(0, Box::new(tool));
         }
         self
     }
 }
 
+impl Default for Builder {
+    fn default() -> Self {
+        Builder::new()
+    }
+}
+
 #[cfg(test)]
 mod test {
     use std::collections::HashMap;