Make recent versions of clippy happy

mozilla · May 23, 2024 · 4ab9c06 · 4ab9c06
1 parent 5f2b5c8
commit 4ab9c06
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 43 deletions.
diff --git a/src/compiler/c.rs b/src/compiler/c.rs
@@ -275,7 +275,7 @@ where
                     .map(|f| f.path())
                     .collect()
             })
-            .unwrap_or(Vec::default())
+            .unwrap_or_default()
     }
 }
 
@@ -485,16 +485,14 @@ where
             debug!("removing files {:?}", &outputs);
 
             let v: std::result::Result<(), std::io::Error> =
-                outputs.values().fold(Ok(()), |r, output| {
-                    r.and_then(|_| {
-                        let mut path = args_cwd.clone();
-                        path.push(&output.path);
-                        match fs::metadata(&path) {
-                            // File exists, remove it.
-                            Ok(_) => fs::remove_file(&path),
-                            _ => Ok(()),
-                        }
-                    })
+                outputs.values().try_for_each(|output| {
+                    let mut path = args_cwd.clone();
+                    path.push(&output.path);
+                    match fs::metadata(&path) {
+                        // File exists, remove it.
+                        Ok(_) => fs::remove_file(&path),
+                        _ => Ok(()),
+                    }
                 });
             if v.is_err() {
                 warn!("Could not remove files after preprocessing failed!");
@@ -624,7 +622,7 @@ const INCBIN_DIRECTIVE: &[u8] = b".incbin";
 fn process_preprocessed_file(
     input_file: &Path,
     cwd: &Path,
-    bytes: &mut Vec<u8>,
+    bytes: &mut [u8],
     included_files: &mut HashMap<PathBuf, String>,
     config: PreprocessorCacheModeConfig,
     time_of_compilation: std::time::SystemTime,

diff --git a/src/compiler/compiler.rs b/src/compiler/compiler.rs
@@ -554,7 +554,7 @@ where
         Some(ref client) => client.rewrite_includes_only(),
         _ => false,
     };
-    let mut path_transformer = dist::PathTransformer::default();
+    let mut path_transformer = dist::PathTransformer::new();
     let (compile_cmd, dist_compile_cmd, cacheable) = compilation
         .generate_compile_commands(&mut path_transformer, rewrite_includes_only)
         .context("Failed to generate compile commands")?;
@@ -1875,7 +1875,7 @@ LLVM version: 6.0",
         let runtime = single_threaded_runtime();
         let pool = runtime.handle();
         let output = "compiler_id=clang\ncompiler_version=\"16.0.0\"";
-        let arguments = vec![
+        let arguments = [
             ovec!["-c", "foo.c", "-o", "foo.o", "-DHELLO"],
             ovec!["-c", "foo.c", "-o", "foo.o", "-DHI"],
             ovec!["-c", "foo.c", "-o", "foo.o"],

diff --git a/src/compiler/diab.rs b/src/compiler/diab.rs
@@ -773,7 +773,7 @@ mod test {
         let compiler = &f.bins[0];
         // Compiler invocation.
         next_command(&creator, Ok(MockChild::new(exit_status(0), "", "")));
-        let mut path_transformer = dist::PathTransformer::default();
+        let mut path_transformer = dist::PathTransformer::new();
         let (command, _, cacheable) = generate_compile_commands(
             &mut path_transformer,
             compiler,

diff --git a/src/compiler/gcc.rs b/src/compiler/gcc.rs
@@ -2035,7 +2035,7 @@ mod test {
         let compiler = &f.bins[0];
         // Compiler invocation.
         next_command(&creator, Ok(MockChild::new(exit_status(0), "", "")));
-        let mut path_transformer = dist::PathTransformer::default();
+        let mut path_transformer = dist::PathTransformer::new();
         let (command, dist_command, cacheable) = generate_compile_commands(
             &mut path_transformer,
             compiler,
@@ -2065,7 +2065,7 @@ mod test {
         };
         let f = TestFixture::new();
         let compiler = &f.bins[0];
-        let mut path_transformer = dist::PathTransformer::default();
+        let mut path_transformer = dist::PathTransformer::new();
         let (command, _, _) = generate_compile_commands(
             &mut path_transformer,
             compiler,

diff --git a/src/compiler/msvc.rs b/src/compiler/msvc.rs
@@ -2450,7 +2450,7 @@ mod test {
         let compiler = &f.bins[0];
         // Compiler invocation.
         next_command(&creator, Ok(MockChild::new(exit_status(0), "", "")));
-        let mut path_transformer = dist::PathTransformer::default();
+        let mut path_transformer = dist::PathTransformer::new();
         let (command, dist_command, cacheable) = generate_compile_commands(
             &mut path_transformer,
             compiler,
@@ -2478,7 +2478,7 @@ mod test {
         };
         let f = TestFixture::new();
         let compiler = &f.bins[0];
-        let mut path_transformer = dist::PathTransformer::default();
+        let mut path_transformer = dist::PathTransformer::new();
         let (command, _, _) = generate_compile_commands(
             &mut path_transformer,
             compiler,
@@ -2535,7 +2535,7 @@ mod test {
         let compiler = &f.bins[0];
         // Compiler invocation.
         next_command(&creator, Ok(MockChild::new(exit_status(0), "", "")));
-        let mut path_transformer = dist::PathTransformer::default();
+        let mut path_transformer = dist::PathTransformer::new();
         let (command, dist_command, cacheable) = generate_compile_commands(
             &mut path_transformer,
             compiler,

diff --git a/src/compiler/tasking_vx.rs b/src/compiler/tasking_vx.rs
@@ -712,7 +712,7 @@ mod test {
         let compiler = &f.bins[0];
         // Compiler invocation.
         next_command(&creator, Ok(MockChild::new(exit_status(0), "", "")));
-        let mut path_transformer = dist::PathTransformer::default();
+        let mut path_transformer = dist::PathTransformer::new();
         let (command, _, cacheable) = generate_compile_commands(
             &mut path_transformer,
             compiler,
@@ -761,7 +761,7 @@ mod test {
         let compiler = &f.bins[0];
         // Compiler invocation.
         next_command(&creator, Ok(MockChild::new(exit_status(0), "", "")));
-        let mut path_transformer = dist::PathTransformer::default();
+        let mut path_transformer = dist::PathTransformer::new();
         let (command, _, cacheable) = generate_compile_commands(
             &mut path_transformer,
             compiler,

diff --git a/src/dist/http.rs b/src/dist/http.rs
@@ -35,7 +35,6 @@ mod common {
     pub trait ReqwestRequestBuilderExt: Sized {
         fn bincode<T: serde::Serialize + ?Sized>(self, bincode: &T) -> Result<Self>;
         fn bytes(self, bytes: Vec<u8>) -> Self;
-        fn bearer_auth(self, token: String) -> Self;
     }
     impl ReqwestRequestBuilderExt for reqwest::blocking::RequestBuilder {
         fn bincode<T: serde::Serialize + ?Sized>(self, bincode: &T) -> Result<Self> {
@@ -51,9 +50,6 @@ mod common {
             .header(header::CONTENT_LENGTH, bytes.len())
             .body(bytes)
         }
-        fn bearer_auth(self, token: String) -> Self {
-            self.bearer_auth(token)
-        }
     }
     impl ReqwestRequestBuilderExt for reqwest::RequestBuilder {
         fn bincode<T: serde::Serialize + ?Sized>(self, bincode: &T) -> Result<Self> {
@@ -69,9 +65,6 @@ mod common {
             .header(header::CONTENT_LENGTH, bytes.len())
             .body(bytes)
         }
-        fn bearer_auth(self, token: String) -> Self {
-            self.bearer_auth(token)
-        }
     }
 
     #[cfg(feature = "dist-client")]

diff --git a/src/dist/mod.rs b/src/dist/mod.rs
@@ -92,7 +92,7 @@ mod path_transform {
         }
     }
 
-    #[derive(Debug, Default)]
+    #[derive(Debug)]
     pub struct PathTransformer {
         dist_to_local_path: HashMap<String, PathBuf>,
     }
@@ -269,10 +269,13 @@ mod path_transform {
     use std::iter;
     use std::path::{Path, PathBuf};
 
-    #[derive(Debug, Default)]
+    #[derive(Debug)]
     pub struct PathTransformer;
 
     impl PathTransformer {
+        pub fn new() -> Self {
+            PathTransformer
+        }
         pub fn as_dist_abs(&mut self, p: &Path) -> Option<String> {
             if !p.is_absolute() {
                 return None;

diff --git a/src/lib.rs b/src/lib.rs
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #![deny(rust_2018_idioms)]
-#![allow(clippy::type_complexity, clippy::new_without_default)]
+#![allow(clippy::type_complexity, clippy::new_without_default, clippy::blocks_in_conditions)]
 #![recursion_limit = "256"]
 
 #[macro_use]

diff --git a/src/lru_disk_cache/lru_cache.rs b/src/lru_disk_cache/lru_cache.rs
@@ -285,10 +285,9 @@ impl<K: Eq + Hash, V, S: BuildHasher> LruCache<K, V, S, Count> {
     /// assert_eq!(cache.get_mut(&1), None);
     /// assert_eq!(cache.get_mut(&2), Some(&mut "c"));
     /// ```
-    pub fn get_mut<Q: ?Sized>(&mut self, k: &Q) -> Option<&mut V>
+    pub fn get_mut<Q: Hash + Eq + ?Sized>(&mut self, k: &Q) -> Option<&mut V>
     where
         K: Borrow<Q>,
-        Q: Hash + Eq,
     {
         self.map.get_refresh(k)
     }
@@ -367,18 +366,16 @@ impl<K: Eq + Hash, V, S: BuildHasher, M: CountableMeter<K, V>> LruCache<K, V, S,
     /// cache.insert(1, "a");
     /// assert!(cache.contains_key(&1));
     /// ```
-    pub fn contains_key<Q: ?Sized>(&self, key: &Q) -> bool
+    pub fn contains_key<Q: Hash + Eq + ?Sized>(&self, key: &Q) -> bool
     where
         K: Borrow<Q>,
-        Q: Hash + Eq,
     {
         self.map.contains_key(key)
     }
 
-    pub fn get<Q: ?Sized>(&mut self, k: &Q) -> Option<&V>
+    pub fn get<Q: Hash + Eq + ?Sized>(&mut self, k: &Q) -> Option<&V>
     where
         K: Borrow<Q>,
-        Q: Hash + Eq,
     {
         self.map.get_refresh(k).map(|v| v as &V)
     }
@@ -429,10 +426,9 @@ impl<K: Eq + Hash, V, S: BuildHasher, M: CountableMeter<K, V>> LruCache<K, V, S,
     /// assert_eq!(cache.remove(&2), None);
     /// assert_eq!(cache.len(), 0);
     /// ```
-    pub fn remove<Q: ?Sized>(&mut self, k: &Q) -> Option<V>
+    pub fn remove<Q: Hash + Eq + ?Sized>(&mut self, k: &Q) -> Option<V>
     where
         K: Borrow<Q>,
-        Q: Hash + Eq,
     {
         self.map.remove(k).map(|v| {
             self.current_measure = self

diff --git a/src/server.rs b/src/server.rs
@@ -398,7 +398,7 @@ thread_local! {
     /// catch_unwind doesn't provide panic location, so we store that
     /// information via a panic hook to be used when catch_unwind
     /// catches a panic.
-    static PANIC_LOCATION: Cell<Option<(String, u32, u32)>> = Cell::new(None);
+    static PANIC_LOCATION: Cell<Option<(String, u32, u32)>> = const { Cell::new(None) };
 }
 
 /// Start an sccache server, listening on `port`.

diff --git a/src/util.rs b/src/util.rs
@@ -203,7 +203,7 @@ impl TimeMacroFinder {
                     // importance compared to just getting many small reads.
                     self.previous_small_read.extend(visit);
                 } else {
-                    self.previous_small_read = visit.to_owned();
+                    visit.clone_into(&mut self.previous_small_read);
                 }
                 self.find_macros(&self.previous_small_read);
                 return;

diff --git a/tests/oauth.rs b/tests/oauth.rs
@@ -1,5 +1,5 @@
 #![deny(rust_2018_idioms)]
-#![cfg(all(feature = "dist-client"))]
+#![cfg(feature = "dist-client")]
 
 use fs_err as fs;
 use std::io::{self, Read, Write};