diff options
Diffstat (limited to 'crates/ra_analysis/src')
-rw-r--r-- | crates/ra_analysis/src/completion/complete_scope.rs | 2 | ||||
-rw-r--r-- | crates/ra_analysis/src/db.rs | 2 | ||||
-rw-r--r-- | crates/ra_analysis/src/imp.rs | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_analysis/src/completion/complete_scope.rs b/crates/ra_analysis/src/completion/complete_scope.rs index daf666505..4dead3689 100644 --- a/crates/ra_analysis/src/completion/complete_scope.rs +++ b/crates/ra_analysis/src/completion/complete_scope.rs | |||
@@ -27,7 +27,7 @@ pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) -> | |||
27 | match res.import { | 27 | match res.import { |
28 | None => true, | 28 | None => true, |
29 | Some(import) => { | 29 | Some(import) => { |
30 | let range = import.range(ctx.db, module.source().file_id()); | 30 | let range = import.range(ctx.db, module.file_id()); |
31 | !range.is_subrange(&ctx.leaf.range()) | 31 | !range.is_subrange(&ctx.leaf.range()) |
32 | } | 32 | } |
33 | } | 33 | } |
diff --git a/crates/ra_analysis/src/db.rs b/crates/ra_analysis/src/db.rs index adfec56d8..d7740f0c4 100644 --- a/crates/ra_analysis/src/db.rs +++ b/crates/ra_analysis/src/db.rs | |||
@@ -91,7 +91,7 @@ salsa::database_storage! { | |||
91 | fn library_symbols() for symbol_index::LibrarySymbolsQuery; | 91 | fn library_symbols() for symbol_index::LibrarySymbolsQuery; |
92 | } | 92 | } |
93 | impl hir::db::HirDatabase { | 93 | impl hir::db::HirDatabase { |
94 | fn m_source_file() for hir::db::MSourceFileQuery; | 94 | fn hir_source_file() for hir::db::HirSourceFileQuery; |
95 | fn expand_macro_invocation() for hir::db::ExpandMacroCallQuery; | 95 | fn expand_macro_invocation() for hir::db::ExpandMacroCallQuery; |
96 | fn module_tree() for hir::db::ModuleTreeQuery; | 96 | fn module_tree() for hir::db::ModuleTreeQuery; |
97 | fn fn_scopes() for hir::db::FnScopesQuery; | 97 | fn fn_scopes() for hir::db::FnScopesQuery; |
diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs index 5669aa94d..ec7da437a 100644 --- a/crates/ra_analysis/src/imp.rs +++ b/crates/ra_analysis/src/imp.rs | |||
@@ -230,7 +230,7 @@ impl AnalysisImpl { | |||
230 | Some(it) => it, | 230 | Some(it) => it, |
231 | }; | 231 | }; |
232 | let root = descr.crate_root(); | 232 | let root = descr.crate_root(); |
233 | let file_id = root.source().file_id(); | 233 | let file_id = root.file_id(); |
234 | 234 | ||
235 | let crate_graph = self.db.crate_graph(); | 235 | let crate_graph = self.db.crate_graph(); |
236 | let crate_id = crate_graph.crate_id_for_crate_root(file_id); | 236 | let crate_id = crate_graph.crate_id_for_crate_root(file_id); |
@@ -283,7 +283,7 @@ impl AnalysisImpl { | |||
283 | if let Some(child_module) = | 283 | if let Some(child_module) = |
284 | source_binder::module_from_declaration(&*self.db, position.file_id, module)? | 284 | source_binder::module_from_declaration(&*self.db, position.file_id, module)? |
285 | { | 285 | { |
286 | let file_id = child_module.source().file_id(); | 286 | let file_id = child_module.file_id(); |
287 | let name = match child_module.name() { | 287 | let name = match child_module.name() { |
288 | Some(name) => name.to_string().into(), | 288 | Some(name) => name.to_string().into(), |
289 | None => "".into(), | 289 | None => "".into(), |