Final cleanup of the code for leftovers

Author: Felixoid

docs/Configuration.md

@@ -154,7 +154,7 @@ Note that some env variables may need sccache server restart to take effect.
 
 * `SCCACHE_ALLOW_CORE_DUMPS` to enable core dumps by the server
 * `SCCACHE_CONF` configuration file path
-* `SCCACHE_BASEDIRS` base directory (or directories) to strip from paths for cache key computation. This is similar to ccache's `CCACHE_BASEDIR` and enables cache hits across different absolute paths when compiling the same source code. Multiple directories can be separated by `;` on Windows hosts and by `:` on any other. When multiple directories are specified, the longest matching prefix is used. Path matching is **case-insensitive** on Windows and **case-sensitive** on other operating systems. Environment variable takes precedence over file configuration. Only absolute paths are supported; relative paths will be ignored with a warning.
+* `SCCACHE_BASEDIRS` base directory (or directories) to strip from paths for cache key computation. This is similar to ccache's `CCACHE_BASEDIR` and enables cache hits across different absolute paths when compiling the same source code. Multiple directories can be separated by `;` on Windows hosts and by `:` on any other. When multiple directories are specified, the longest matching prefix is used. Path matching is **case-insensitive** on Windows and **case-sensitive** on other operating systems. Environment variable takes precedence over file configuration. Only absolute paths are supported; relative paths will cause an error and prevent the server from start.
 * `SCCACHE_CACHED_CONF`
 * `SCCACHE_IDLE_TIMEOUT` how long the local daemon process waits for more client requests before exiting, in seconds. Set to `0` to run sccache permanently
 * `SCCACHE_STARTUP_NOTIFY` specify a path to a socket which will be used for server completion notification

src/cache/cache.rs

@@ -880,8 +880,6 @@ mod test {
     #[test]
     #[cfg(feature = "s3")]
     fn test_operator_storage_s3_with_basedirs() {
-        use std::path::PathBuf;
-
         // Create S3 operator (doesn't need real credentials for this test)
         let operator = crate::cache::s3::S3Cache::new(
             "test-bucket".to_string(),
@@ -910,8 +908,6 @@ mod test {
     #[test]
     #[cfg(feature = "redis")]
     fn test_operator_storage_redis_with_basedirs() {
-        use std::path::PathBuf;
-
         // Create Redis operator
         let operator = crate::cache::redis::RedisCache::build_single(
             "redis://localhost:6379",

src/cache/readonly.rs

@@ -143,16 +143,16 @@ mod test {
         std::fs::create_dir(&cache_dir).unwrap();
 
         let basedirs = vec![
-            std::path::PathBuf::from("/home/user/project"),
-            std::path::PathBuf::from("/home/user/workspace"),
+            PathBuf::from("/home/user/project"),
+            PathBuf::from("/home/user/workspace"),
         ];
 
         let disk_cache = crate::cache::disk::DiskCache::new(
             &cache_dir,
             1024 * 1024,
             runtime.handle(),
-            super::super::PreprocessorCacheModeConfig::default(),
-            super::super::CacheMode::ReadWrite,
+            super::PreprocessorCacheModeConfig::default(),
+            super::CacheMode::ReadWrite,
             basedirs.clone(),
         );
 

src/compiler/c.rs

@@ -26,7 +26,7 @@ use crate::dist::pkg;
 use crate::mock_command::CommandCreatorSync;
 use crate::util::{
     Digest, HashToDigest, MetadataCtimeExt, TimeMacroFinder, Timestamp, decode_path, encode_path,
-    hash_all,
+    hash_all, strip_basedirs,
 };
 use async_trait::async_trait;
 use fs_err as fs;
@@ -1486,7 +1486,6 @@ pub fn hash_key(
 
     // Strip basedirs from preprocessor output if configured
     let preprocessor_output_to_hash = if !basedirs.is_empty() {
-        use crate::util::strip_basedirs;
         Cow::Owned(strip_basedirs(preprocessor_output, basedirs))
     } else {
         Cow::Borrowed(preprocessor_output)
@@ -1805,8 +1804,6 @@ mod test {
 
     #[test]
     fn test_hash_key_basedirs() {
-        use std::path::PathBuf;
-
         let args = ovec!["a", "b", "c"];
         let digest = "abcd";
 

src/compiler/preprocessor_cache.rs

@@ -34,7 +34,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     cache::PreprocessorCacheModeConfig,
-    util::{Digest, HashToDigest, MetadataCtimeExt, Timestamp, encode_path},
+    util::{Digest, HashToDigest, MetadataCtimeExt, Timestamp, encode_path, strip_basedirs},
 };
 
 use super::Language;
@@ -418,7 +418,6 @@ pub fn preprocessor_cache_entry_hash_key(
 
     // Strip basedirs from the input file path if configured
     let buf_to_hash = if !basedirs.is_empty() {
-        use crate::util::strip_basedirs;
         strip_basedirs(&buf, basedirs)
     } else {
         buf.clone()

src/config.rs

@@ -952,11 +952,10 @@ fn config_from_env() -> Result<EnvConfig> {
     // ======= Base directory =======
     // Support multiple paths separated by ';' on Windows and ':' on other platforms
     // to match PATH behavior.
-    let split_symbol = if cfg!(target_os = "windows") {
-        ';'
-    } else {
-        ':'
-    };
+    #[cfg(target_os = "windows")]
+    let split_symbol = ';';
+    #[cfg(not(target_os = "windows"))]
+    let split_symbol = ':';
     let basedirs = env::var_os("SCCACHE_BASEDIRS")
         .map(|s| {
             s.to_string_lossy()

src/util.rs

@@ -1129,6 +1129,7 @@ fn normalize_path(path: &[u8]) -> Vec<u8> {
 mod tests {
     use super::{OsStrExt, TimeMacroFinder};
     use std::ffi::{OsStr, OsString};
+    use std::path::PathBuf;
 
     #[test]
     fn simple_starts_with() {
@@ -1280,8 +1281,6 @@ mod tests {
 
     #[test]
     fn test_strip_basedir_simple() {
-        use std::path::PathBuf;
-
         // Simple cases
         let basedir = PathBuf::from("/home/user/project");
         let input = b"# 1 \"/home/user/project/src/main.c\"\nint main() { return 0; }";
@@ -1304,8 +1303,6 @@ mod tests {
 
     #[test]
     fn test_strip_basedir_empty() {
-        use std::path::PathBuf;
-
         // Empty basedir slice
         let input = b"# 1 \"/home/user/project/src/main.c\"";
         let output = super::strip_basedirs(input, &[]);
@@ -1320,8 +1317,6 @@ mod tests {
 
     #[test]
     fn test_strip_basedir_not_at_boundary() {
-        use std::path::PathBuf;
-
         // basedir should only match at word boundaries
         let basedir = PathBuf::from("/home/user");
         let input = b"text/home/user/file.c and \"/home/user/other.c\"";
@@ -1333,8 +1328,6 @@ mod tests {
 
     #[test]
     fn test_strip_basedir_trailing_slashes() {
-        use std::path::PathBuf;
-
         // Without trailing slash
         let basedir = PathBuf::from("/home/user/project");
         let input = b"# 1 \"/home/user/project/src/main.c\"";
@@ -1359,8 +1352,6 @@ mod tests {
 
     #[test]
     fn test_strip_basedirs_multiple() {
-        use std::path::PathBuf;
-
         // Multiple basedirs - should match longest first
         let basedirs = vec![
             PathBuf::from("/home/user1/project"),
@@ -1386,8 +1377,6 @@ mod tests {
     #[cfg(target_os = "windows")]
     #[test]
     fn test_strip_basedir_windows_backslashes() {
-        use std::path::PathBuf;
-
         // Without trailing backslash
         let basedir = PathBuf::from("C:\\Users\\test\\project");
         let input = b"# 1 \"C:\\Users\\test\\project\\src\\main.c\"";
@@ -1407,8 +1396,6 @@ mod tests {
     #[cfg(target_os = "windows")]
     #[test]
     fn test_strip_basedir_windows_mixed_slashes() {
-        use std::path::PathBuf;
-
         // Mixed forward and backslashes in input (common from certain build systems)
         let basedir = PathBuf::from("C:\\Users\\test\\project");
         let input = b"# 1 \"C:/Users\\test\\project\\src/main.c\"";