Merge branch 'main' into switch-once-cell-crate-to-standard-library

Author: sylvestre

README.md

@@ -188,7 +188,7 @@ And you can build code as usual without any additional flags in the command line
 Build Requirements
 ------------------
 
-sccache is a [Rust](https://www.rust-lang.org/) program. Building it requires `cargo` (and thus`rustc`). sccache currently requires **Rust 1.75.0**. We recommend you install Rust via [Rustup](https://rustup.rs/).
+sccache is a [Rust](https://www.rust-lang.org/) program. Building it requires `cargo` (and thus`rustc`). sccache currently requires **Rust 1.85.0**. We recommend you install Rust via [Rustup](https://rustup.rs/).
 
 Build
 -----

src/cache/cache.rs

@@ -507,10 +507,10 @@ impl Storage for opendal::Operator {
             // can do, so we will print our the error here to make users know
             // about it.
             Err(err) if err.kind() == ErrorKind::RateLimited => {
-                eprintln!("cache storage read check: {err:?}, but we decide to keep running")
+                eprintln!("cache storage read check: {err:?}, but we decide to keep running");
             }
             Err(err) => bail!("cache storage failed to read: {:?}", err),
-        };
+        }
 
         let can_write = match self.write(path, "Hello, World!").await {
             Ok(_) => true,

src/cmdline.rs

@@ -22,8 +22,9 @@ use which::which_in;
 
 const ENV_VAR_INTERNAL_START_SERVER: &str = "SCCACHE_START_SERVER";
 
-#[derive(Debug, Clone, ValueEnum)]
+#[derive(Debug, Clone, ValueEnum, Default)]
 pub enum StatsFormat {
+    #[default]
     Text,
     Json,
 }
@@ -49,12 +50,6 @@ impl FromStr for StatsFormat {
     }
 }
 
-impl Default for StatsFormat {
-    fn default() -> Self {
-        Self::Text
-    }
-}
-
 /// A specific command to run.
 pub enum Command {
     /// Show cache statistics and exit.

src/commands.rs

@@ -322,7 +322,7 @@ fn connect_or_start_server(
                     }
                 }
                 ServerStartup::AddrInUse => {
-                    debug!("AddrInUse: possible parallel server bootstraps, retrying..")
+                    debug!("AddrInUse: possible parallel server bootstraps, retrying..");
                 }
                 ServerStartup::TimedOut => bail!(
                     "Timed out waiting for server startup. Maybe the remote service is unreachable?\nRun with SCCACHE_LOG=debug SCCACHE_NO_DAEMON=1 to get more information"
@@ -558,7 +558,7 @@ where
         CompileResponse::UnhandledCompile => {
             debug!("Server sent UnhandledCompile");
         }
-    };
+    }
 
     let mut cmd = creator.new_command_sync(exe);
     cmd.args(&cmdline).current_dir(cwd);
@@ -703,7 +703,7 @@ pub fn run_command(cmd: Command) -> Result<i32> {
 
             match &config.dist.auth {
                 config::DistAuth::Token { .. } => {
-                    info!("No authentication needed for type 'token'")
+                    info!("No authentication needed for type 'token'");
                 }
                 config::DistAuth::Oauth2CodeGrantPKCE {
                     client_id,
@@ -725,7 +725,7 @@ pub fn run_command(cmd: Command) -> Result<i32> {
                             c.dist.auth_tokens.insert(auth_url.to_owned(), token);
                         })
                         .context("Unable to save auth token")?;
-                    println!("Saved token")
+                    println!("Saved token");
                 }
                 config::DistAuth::Oauth2Implicit {
                     client_id,
@@ -743,9 +743,9 @@ pub fn run_command(cmd: Command) -> Result<i32> {
                             c.dist.auth_tokens.insert(auth_url.to_owned(), token);
                         })
                         .context("Unable to save auth token")?;
-                    println!("Saved token")
+                    println!("Saved token");
                 }
-            };
+            }
         }
         #[cfg(not(feature = "dist-client"))]
         Command::DistAuth => bail!(
@@ -777,7 +777,7 @@ pub fn run_command(cmd: Command) -> Result<i32> {
                     .await
                     .map(|compiler| compiler.0.get_toolchain_packager())
                     .and_then(|packager| packager.write_pkg(out_file))
-            })?
+            })?;
         }
         #[cfg(not(feature = "dist-client"))]
         Command::PackageToolchain(_executable, _out) => bail!(

src/compiler/c.rs

@@ -319,7 +319,7 @@ impl<T: CommandCreatorSync, I: CCompilerImpl> Compiler<T> for CCompiler<I> {
                 // Handle SCCACHE_EXTRAFILES
                 for (k, v) in env_vars.iter() {
                     if k.as_os_str() == OsStr::new("SCCACHE_EXTRAFILES") {
-                        args.extra_hash_files.extend(std::env::split_paths(&v))
+                        args.extra_hash_files.extend(std::env::split_paths(&v));
                     }
                 }
 
@@ -336,7 +336,7 @@ impl<T: CommandCreatorSync, I: CCompilerImpl> Compiler<T> for CCompiler<I> {
                 // too much to handle on our side so we just hash every bitcode library we find.
                 if args.language == Language::Hip {
                     args.extra_hash_files
-                        .extend(Self::search_hip_device_libs(&args, env_vars))
+                        .extend(Self::search_hip_device_libs(&args, env_vars));
                 }
 
                 CompilerArguments::Ok(Box::new(CCompilerHasher {
@@ -757,7 +757,7 @@ fn process_preprocessed_file(
                     hash_start = h;
                     continue;
                 }
-            };
+            }
         } else if slice
             .strip_prefix(INCBIN_DIRECTIVE)
             .filter(|slice| {
@@ -923,7 +923,7 @@ fn process_preprocessor_line(
         fs_impl,
     )? {
         return Ok(ControlFlow::Break((start, hash_start, false)));
-    };
+    }
     // Everything of interest between hash_start and start has been hashed now.
     hash_start = start;
     Ok(ControlFlow::Continue((start, hash_start)))

src/compiler/cicc.rs

@@ -196,7 +196,7 @@ where
                 args.extend(arg.iter_os_strings());
             }
             _ => continue,
-        };
+        }
     }
 
     if let Some(module_id_path) = module_id_file_name {

src/compiler/clang.rs

@@ -128,7 +128,7 @@ impl CCompilerImpl for Clang {
 
         // Clang 14 and later support -fminimize-whitespace, which normalizes away non-semantic whitespace which in turn increases cache hit rate.
         if self.is_minversion(14) {
-            ignorable_whitespace_flags.push("-fminimize-whitespace".to_string())
+            ignorable_whitespace_flags.push("-fminimize-whitespace".to_string());
         }
 
         gcc::preprocess(

src/compiler/gcc.rs

@@ -421,7 +421,7 @@ where
                         )
                     }
                     _ => {}
-                };
+                }
                 seen_arch = Some(arch.clone());
             }
             Some(XClang(s)) => xclangs.push(s.clone()),
@@ -566,7 +566,7 @@ where
         };
         for arg in arg.normalize(norm).iter_os_strings() {
             args.push("-Xclang".into());
-            args.push(arg)
+            args.push(arg);
         }
     }
 
@@ -868,7 +868,7 @@ where
     let language = language_to_arg(parsed_args.language);
     let mut arguments: Vec<OsString> = vec![];
     if let Some(lang) = &language {
-        arguments.extend(vec!["-x".into(), lang.into()])
+        arguments.extend(vec!["-x".into(), lang.into()]);
     }
     arguments.extend(vec![
         parsed_args.compilation_flag.clone(),
@@ -927,7 +927,7 @@ where
             let mut arguments: Vec<String> = vec![];
             // Language needs to be before input
             if let Some(lang) = &language {
-                arguments.extend(vec!["-x".into(), lang.into()])
+                arguments.extend(vec!["-x".into(), lang.into()]);
             }
             arguments.extend(vec![
                 parsed_args.compilation_flag.clone().into_string().ok()?,

src/compiler/msvc.rs

@@ -610,7 +610,7 @@ pub fn parse_arguments(
                 common_args.extend(
                     arg.normalize(NormalizedDisposition::Concatenated)
                         .iter_os_strings(),
-                )
+                );
             }
             Some(ExternalIncludePath(_)) => common_args.extend(
                 arg.normalize(NormalizedDisposition::Separated)

src/compiler/nvcc.rs

@@ -328,7 +328,7 @@ pub fn generate_compile_commands(
                 keep = true;
                 unhashed_args.splice(idx..(idx + 1), []);
                 if keep_dir.is_none() {
-                    keep_dir = Some(cwd.to_path_buf())
+                    keep_dir = Some(cwd.to_path_buf());
                 }
                 continue;
             }
@@ -391,7 +391,7 @@ pub fn generate_compile_commands(
     let mut arguments = vec![];
 
     if let Some(lang) = gcc::language_to_gcc_arg(parsed_args.language) {
-        arguments.extend(vec!["-x".into(), lang.into()])
+        arguments.extend(vec!["-x".into(), lang.into()]);
     }
 
     let output = &parsed_args