Merge #4813

4813: Simplify r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

Author: bors[bot]

crates/ra_db/src/input.rs

@@ -337,15 +337,11 @@ impl Env {
 }
 
 impl ExternSource {
-    pub fn extern_path(&self, path: impl AsRef<Path>) -> Option<(ExternSourceId, RelativePathBuf)> {
-        let path = path.as_ref();
+    pub fn extern_path(&self, path: &Path) -> Option<(ExternSourceId, RelativePathBuf)> {
         self.extern_paths.iter().find_map(|(root_path, id)| {
-            if let Ok(rel_path) = path.strip_prefix(root_path) {
-                let rel_path = RelativePathBuf::from_path(rel_path).ok()?;
-                Some((*id, rel_path))
-            } else {
-                None
-            }
+            let rel_path = path.strip_prefix(root_path).ok()?;
+            let rel_path = RelativePathBuf::from_path(rel_path).ok()?;
+            Some((*id, rel_path))
         })
     }
 

crates/ra_db/src/lib.rs

@@ -158,7 +158,7 @@ impl<T: SourceDatabaseExt> FileLoader for FileLoaderDelegate<&'_ T> {
         if std::path::Path::new(path).is_absolute() {
             let krate = *self.relevant_crates(anchor).get(0)?;
             let (extern_source_id, relative_file) =
-                self.0.crate_graph()[krate].extern_source.extern_path(path)?;
+                self.0.crate_graph()[krate].extern_source.extern_path(path.as_ref())?;
 
             let source_root = self.0.source_root(SourceRootId(extern_source_id.0));
             source_root.file_by_relative_path(&relative_file)