diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-26 20:27:30 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-26 20:27:30 +0000 |
commit | 0974e6abeb9c3f047e21c3e23769b93c9e7dcaf3 (patch) | |
tree | f054e2dcf065c34ecb5c42ea2bd58c520a8d3a21 /crates/ra_hir/src/nameres.rs | |
parent | 2d337c88b07b6a67b24f4bff4d72025d9ea412a5 (diff) | |
parent | a128075af9dd7286d444312ca3bbb9645c008f50 (diff) |
Merge #682
682: remove Option<SourceFileItemId> hack r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/nameres.rs')
-rw-r--r-- | crates/ra_hir/src/nameres.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir/src/nameres.rs b/crates/ra_hir/src/nameres.rs index 5193900e0..97ce6c946 100644 --- a/crates/ra_hir/src/nameres.rs +++ b/crates/ra_hir/src/nameres.rs | |||
@@ -215,7 +215,7 @@ where | |||
215 | // Populate extern crates prelude | 215 | // Populate extern crates prelude |
216 | { | 216 | { |
217 | let root_id = module_id.crate_root(&self.module_tree); | 217 | let root_id = module_id.crate_root(&self.module_tree); |
218 | let file_id = root_id.source(&self.module_tree).file_id; | 218 | let file_id = root_id.file_id(&self.module_tree); |
219 | let crate_graph = self.db.crate_graph(); | 219 | let crate_graph = self.db.crate_graph(); |
220 | if let Some(crate_id) = crate_graph.crate_id_for_crate_root(file_id.as_original_file()) | 220 | if let Some(crate_id) = crate_graph.crate_id_for_crate_root(file_id.as_original_file()) |
221 | { | 221 | { |