Clean out basedir intermediate step, use basedirs

Author: Felixoid

README.md

@@ -278,19 +278,19 @@ This is most useful when using sccache for Rust compilation, as rustc supports u
 
 ---
 
-Normalizing Paths with `SCCACHE_BASEDIR`
+Normalizing Paths with `SCCACHE_BASEDIRS`
 -----------------------------------------
 
-By default, sccache requires absolute paths to match for cache hits. To enable cache sharing across different build directories, you can set `SCCACHE_BASEDIR` to strip a base directory from paths before hashing:
+By default, sccache requires absolute paths to match for cache hits. To enable cache sharing across different build directories, you can set `SCCACHE_BASEDIRS` to strip a base directory from paths before hashing:
 
 ```bash
-export SCCACHE_BASEDIR=/home/user/project
+export SCCACHE_BASEDIRS=/home/user/project
 ```
 
 You can also specify multiple base directories by separating them with `|` (pipe character). When multiple directories are provided, the longest matching prefix is used:
 
 ```bash
-export SCCACHE_BASEDIR="/home/user/project|/home/user/workspace"
+export SCCACHE_BASEDIRS="/home/user/project|/home/user/workspace"
 ```
 
 This is similar to ccache's `CCACHE_BASEDIR` and helps when:
@@ -305,10 +305,10 @@ You can also configure this in the sccache config file:
 
 ```toml
 # Single directory
-basedir = "/home/user/project"
+basedirs = ["/home/user/project"]
 
 # Or multiple directories
-basedir = ["/home/user/project", "/home/user/workspace"]
+basedirs = ["/home/user/project", "/home/user/workspace"]
 ```
 
 ---
@@ -318,7 +318,7 @@ Known Caveats
 
 ### General
 
-* By default, absolute paths to files must match to get a cache hit. To work around this, use `SCCACHE_BASEDIR` (see above) to normalize paths before hashing.
+* By default, absolute paths to files must match to get a cache hit. To work around this, use `SCCACHE_BASEDIRS` (see above) to normalize paths before hashing.
 
 ### Rust
 

docs/Configuration.md

@@ -9,14 +9,14 @@ server_startup_timeout_ms = 10000
 # Base directory (or directories) to strip from paths for cache key computation.
 # Similar to ccache's CCACHE_BASEDIR. This enables cache hits across
 # different absolute paths when compiling the same source code.
-# Can be a single path or an array of paths. When multiple paths are provided,
+# Can be an array of paths. When multiple paths are provided,
 # the longest matching prefix is used.
 # For example, if basedir is "/home/user/project", then paths like
 # "/home/user/project/src/main.c" will be normalized to "./src/main.c"
 # for caching purposes.
-basedir = "/home/user/project"
+basedirs = ["/home/user/project"]
 # Or multiple directories:
-# basedir = ["/home/user/project", "/home/user/workspace"]
+# basedirs = ["/home/user/project", "/home/user/workspace"]
 
 [dist]
 # where to find the scheduler
@@ -146,7 +146,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_BASEDIR` 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 `|` (pipe character). When multiple directories are specified, the longest matching prefix is used. 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 `|` (pipe character). When multiple directories are specified, the longest matching prefix is used. Environment variable takes precedence over file configuration. Only absolute paths are supported; relative paths will be ignored with a warning.
 * `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

@@ -743,7 +743,7 @@ pub fn storage_from_config(
 
     // Validate that all basedirs are absolute paths
     let basedirs: Vec<PathBuf> = config
-        .basedir
+        .basedirs
         .iter()
         .filter_map(|p| {
             if p.is_absolute() {

src/compiler/c.rs

@@ -1803,7 +1803,7 @@ mod test {
     }
 
     #[test]
-    fn test_hash_key_basedir() {
+    fn test_hash_key_basedirs() {
         use std::path::PathBuf;
 
         let args = ovec!["a", "b", "c"];
@@ -1813,8 +1813,10 @@ mod test {
         let preprocessed1 = b"# 1 \"/home/user1/project/src/main.c\"\nint main() { return 0; }";
         let preprocessed2 = b"# 1 \"/home/user2/project/src/main.c\"\nint main() { return 0; }";
 
-        let basedir1 = PathBuf::from("/home/user1/project");
-        let basedir2 = PathBuf::from("/home/user2/project");
+        let basedirs = [
+            PathBuf::from("/home/user1/project"),
+            PathBuf::from("/home/user2/project"),
+        ];
 
         let h1 = hash_key(
             digest,
@@ -1824,7 +1826,7 @@ mod test {
             &[],
             preprocessed1,
             false,
-            std::slice::from_ref(&basedir1),
+            &basedirs,
         );
         let h2 = hash_key(
             digest,
@@ -1834,7 +1836,7 @@ mod test {
             &[],
             preprocessed2,
             false,
-            std::slice::from_ref(&basedir2),
+            &basedirs,
         );
 
         assert_eq!(h1, h2);
@@ -1877,7 +1879,7 @@ mod test {
             &[],
             preprocessed_cpp1,
             true,
-            std::slice::from_ref(&basedir1),
+            &basedirs,
         );
         let h_cpp2 = hash_key(
             digest,
@@ -1887,7 +1889,7 @@ mod test {
             &[],
             preprocessed_cpp2,
             true,
-            std::slice::from_ref(&basedir2),
+            &basedirs,
         );
 
         assert_eq!(h_cpp1, h_cpp2);