From 1c5ce7a8682c9e14ce726388b88897644721b19b Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Wed, 19 Dec 2018 01:48:46 +0300
Subject: File module source does not depend on syntax

---
 crates/ra_hir/src/module/imp.rs     | 4 ++--
 crates/ra_hir/src/module/nameres.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'crates/ra_hir/src/module')

diff --git a/crates/ra_hir/src/module/imp.rs b/crates/ra_hir/src/module/imp.rs
index 9f144e139..4a19842c4 100644
--- a/crates/ra_hir/src/module/imp.rs
+++ b/crates/ra_hir/src/module/imp.rs
@@ -66,7 +66,7 @@ fn create_module_tree<'a>(
 
     let source_root = db.source_root(source_root);
     for &file_id in source_root.files.iter() {
-        let source = ModuleSource::new_file(db, file_id);
+        let source = ModuleSource::new_file(file_id);
         if visited.contains(&source) {
             continue; // TODO: use explicit crate_roots here
         }
@@ -126,7 +126,7 @@ fn build_subtree(
                             visited,
                             roots,
                             Some(link),
-                            ModuleSource::new_file(db, file_id),
+                            ModuleSource::new_file(file_id),
                         ),
                     })
                     .collect::<Cancelable<Vec<_>>>()?;
diff --git a/crates/ra_hir/src/module/nameres.rs b/crates/ra_hir/src/module/nameres.rs
index 9afeade9e..5540b827f 100644
--- a/crates/ra_hir/src/module/nameres.rs
+++ b/crates/ra_hir/src/module/nameres.rs
@@ -98,7 +98,7 @@ impl NamedImport {
     pub fn range(&self, db: &impl HirDatabase, file_id: FileId) -> TextRange {
         let source_item_id = SourceItemId {
             file_id,
-            item_id: self.file_item_id,
+            item_id: Some(self.file_item_id),
         };
         let syntax = db.file_item(source_item_id);
         let offset = syntax.borrowed().range().start();
@@ -281,7 +281,7 @@ where
                 module_id,
                 source_item_id: SourceItemId {
                     file_id,
-                    item_id: item.id,
+                    item_id: Some(item.id),
                 },
             };
             let def_id = def_loc.id(self.db);
-- 
cgit v1.2.3