Fix more clippy warning - without autofix

mozilla · Oct 18, 2023 · b8d8f57 · b8d8f57
1 parent eb929d1
commit b8d8f57
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/src/server.rs b/src/server.rs
@@ -225,8 +225,10 @@ impl DistClientContainer {
             | DistClientState::FailWithMessage(cfg, _)
             | DistClientState::RetryCreateAt(cfg, _) => {
                 warn!("State reset. Will recreate");
-                *state =
-                    DistClientState::RetryCreateAt(cfg, Instant::now() - Duration::from_secs(1));
+                *state = DistClientState::RetryCreateAt(
+                    cfg,
+                    Instant::now().checked_sub(Duration::from_secs(1)).unwrap(),
+                );
             }
             DistClientState::Disabled => (),
         }
@@ -277,8 +279,10 @@ impl DistClientContainer {
             };
             // The client is most likely mis-configured, make sure we
             // re-create on our next attempt.
-            *state =
-                DistClientState::RetryCreateAt(config, Instant::now() - Duration::from_secs(1));
+            *state = DistClientState::RetryCreateAt(
+                config,
+                Instant::now().checked_sub(Duration::from_secs(1)).unwrap(),
+            );
         }
         res
     }
@@ -587,7 +591,7 @@ impl<C: CommandCreatorSync> SccacheServer<C> {
 
                 // We're not interested if the task panicked; immediately process
                 // another connection
-                let _ = tokio::spawn(conn);
+                let _ = tokio::spawn(conn).await;
             }
         };
 

diff --git a/src/test/tests.rs b/src/test/tests.rs
@@ -290,7 +290,7 @@ fn test_server_port_in_use() {
     // Bind an arbitrary free port.
     let listener = TcpListener::bind("127.0.0.1:0").unwrap();
     let sccache = find_sccache_binary();
-    let output = Command::new(&sccache)
+    let output = Command::new(sccache)
         .arg("--start-server")
         .env(
             "SCCACHE_SERVER_PORT",

diff --git a/src/test/utils.rs b/src/test/utils.rs
@@ -155,6 +155,7 @@ pub fn mk_bin_contents<F: FnOnce(File) -> io::Result<()>>(
     let bin = dir.join(path);
     let parent = bin.parent().unwrap();
     fs::create_dir_all(parent)?;
+    #[allow(clippy::unnecessary_cast)]
     let f = fs::OpenOptions::new()
         .write(true)
         .create(true)