Remove unnecessary Arc from FilesIndex

Author: Kobzol

compiler/rustc_session/src/search_paths.rs

@@ -16,7 +16,7 @@ pub struct SearchPath {
 
 /// [FilesIndex] contains paths that can be efficiently looked up with (prefix, suffix) pairs.
 #[derive(Clone, Debug)]
-pub struct FilesIndex(Vec<(Arc<str>, SearchPathFile)>);
+pub struct FilesIndex(Vec<SearchPathFile>);
 
 impl FilesIndex {
     /// Look up [SearchPathFile] by (prefix, suffix) pair.
@@ -25,15 +25,15 @@ impl FilesIndex {
         prefix: &str,
         suffix: &str,
     ) -> Option<impl Iterator<Item = (String, &'s SearchPathFile)>> {
-        let start = self.0.partition_point(|(k, _)| **k < *prefix);
+        let start = self.0.partition_point(|v| *v.file_name_str < *prefix);
         if start == self.0.len() {
             return None;
         }
-        let end = self.0[start..].partition_point(|(k, _)| k.starts_with(prefix));
+        let end = self.0[start..].partition_point(|v| v.file_name_str.starts_with(prefix));
         let prefixed_items = &self.0[start..][..end];
 
-        let ret = prefixed_items.into_iter().filter_map(move |(k, v)| {
-            k.ends_with(suffix).then(|| {
+        let ret = prefixed_items.into_iter().filter_map(move |v| {
+            v.file_name_str.ends_with(suffix).then(|| {
                 (
                     String::from(
                         &v.file_name_str[prefix.len()..v.file_name_str.len() - suffix.len()],
@@ -45,7 +45,7 @@ impl FilesIndex {
         Some(ret)
     }
     pub fn retain(&mut self, prefixes: &[&str]) {
-        self.0.retain(|(k, _)| prefixes.iter().any(|prefix| k.starts_with(prefix)));
+        self.0.retain(|v| prefixes.iter().any(|prefix| v.file_name_str.starts_with(prefix)));
     }
 }
 /// The obvious implementation of `SearchPath::files` is a `Vec<PathBuf>`. But
@@ -136,18 +136,15 @@ impl SearchPath {
                     e.ok().and_then(|e| {
                         e.file_name().to_str().map(|s| {
                             let file_name_str: Arc<str> = s.into();
-                            (
-                                Arc::clone(&file_name_str),
-                                SearchPathFile { path: e.path().into(), file_name_str },
-                            )
+                            SearchPathFile { path: e.path().into(), file_name_str }
                         })
                     })
                 })
                 .collect::<Vec<_>>(),
 
             Err(..) => Default::default(),
         };
-        files.sort_by(|(lhs, _), (rhs, _)| lhs.cmp(rhs));
+        files.sort_by(|lhs, rhs| lhs.file_name_str.cmp(&rhs.file_name_str));
         let files = FilesIndex(files);
         SearchPath { kind, dir, files }
     }