2 files changed, 9 insertions, 7 deletions
diff --git a/crates/ra_hir/src/mock.rs b/crates/ra_hir/src/mock.rs
index 77a44a275..972f0ece5 100644
--- a/crates/ra_hir/src/mock.rs
+++ b/crates/ra_hir/src/mock.rs
@@ -157,7 +157,7 @@ impl MockDatabase {
        self.set_file_text(file_id, text);
        self.set_file_relative_path(file_id, rel_path.clone());
        self.set_file_source_root(file_id, source_root_id);
-        source_root.files.insert(rel_path, file_id);
+        source_root.insert_file(rel_path, file_id);
        if is_crate_root {
            let mut crate_graph = CrateGraph::default();
diff --git a/crates/ra_hir/src/nameres/mod_resolution.rs b/crates/ra_hir/src/nameres/mod_resolution.rs
index c6be93dcd..918c9591f 100644
--- a/crates/ra_hir/src/nameres/mod_resolution.rs
+++ b/crates/ra_hir/src/nameres/mod_resolution.rs
@@ -122,10 +122,12 @@ enum OutOfLineMode {
 impl OutOfLineMode {
    pub fn resolve(&self, source_root: Arc<SourceRoot>) -> Result<FileId, RelativePathBuf> {
        match self {
-            OutOfLineMode::RootOrModRs { file, directory } => match source_root.files.get(file) {
+            OutOfLineMode::RootOrModRs { file, directory } => {
-                None => resolve_simple_path(source_root, directory).map_err(|_| file.clone()),
+                match source_root.file_by_relative_path(file) {
-                file_id => resolve_find_result(file_id, file),
+                    None => resolve_simple_path(source_root, directory).map_err(|_| file.clone()),
-            },
+                    file_id => resolve_find_result(file_id, file),
+                }
+            }
            OutOfLineMode::FileInDirectory(path) => resolve_simple_path(source_root, path),
            OutOfLineMode::WithAttributePath(path) => resolve_simple_path(source_root, path),
        }
@@ -170,11 +172,11 @@ fn resolve_simple_path(
    source_root: Arc<SourceRoot>,
    path: &RelativePathBuf,
 ) -> Result<FileId, RelativePathBuf> {
-    resolve_find_result(source_root.files.get(path), path)
+    resolve_find_result(source_root.file_by_relative_path(path), path)
 }
 fn resolve_find_result(
-    file_id: Option<&FileId>,
+    file_id: Option<FileId>,
    path: &RelativePathBuf,
 ) -> Result<FileId, RelativePathBuf> {
    match file_id {