Do not store directory at all in SearchPathFile

Author: Kobzol

compiler/rustc_metadata/src/locator.rs

@@ -438,7 +438,7 @@ impl<'a> CrateLocator<'a> {
                 }
                 if let Some(matches) = spf.query(prefix, suffix) {
                     for (hash, spf) in matches {
-                        let spf_path = spf.path();
+                        let spf_path = spf.path(&search_path.dir);
                         info!("lib candidate: {}", spf_path.display());
 
                         let (rlibs, rmetas, dylibs, interfaces) =
@@ -471,9 +471,10 @@ impl<'a> CrateLocator<'a> {
                 .flatten()
             {
                 for (_, spf) in static_matches {
-                    crate_rejections
-                        .via_kind
-                        .push(CrateMismatch { path: spf.path(), got: "static".to_string() });
+                    crate_rejections.via_kind.push(CrateMismatch {
+                        path: spf.path(&search_path.dir),
+                        got: "static".to_string(),
+                    });
                 }
             }
         }

compiler/rustc_session/src/search_paths.rs

@@ -61,15 +61,13 @@ impl FilesIndex {
 /// UTF-8, and so a non-UTF-8 filename couldn't be one we're looking for.)
 #[derive(Clone, Debug)]
 pub struct SearchPathFile {
-    // We store the directory in a shared Arc, as many files can share the same directory.
-    dir: Arc<Path>,
     file_name_str: Arc<str>,
 }
 
 impl SearchPathFile {
     /// Constructs the full path to the file.
-    pub fn path(&self) -> PathBuf {
-        self.dir.join(&*self.file_name_str)
+    pub fn path(&self, dir: &Path) -> PathBuf {
+        dir.join(&*self.file_name_str)
     }
 }
 
@@ -137,16 +135,12 @@ impl SearchPath {
     }
 
     pub fn new(kind: PathKind, dir: PathBuf) -> Self {
-        let dir_file: Arc<Path> = dir.clone().into();
         // Get the files within the directory.
         let mut files = match std::fs::read_dir(&dir) {
             Ok(files) => files
                 .filter_map(|e| {
                     e.ok().and_then(|e| {
-                        e.file_name().to_str().map(|s| {
-                            let file_name_str: Arc<str> = s.into();
-                            SearchPathFile { dir: dir_file.clone(), file_name_str }
-                        })
+                        e.file_name().to_str().map(|s| SearchPathFile { file_name_str: s.into() })
                     })
                 })
                 .collect::<Vec<SearchPathFile>>(),