diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 14:56:10 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 14:56:10 +0000 |
commit | a36b2cf377a90cf13bb097e57878b8384d30c53a (patch) | |
tree | e5776811753f66c50d98dd155199c9cadd6b2bfb /crates/ra_hir/src/code_model_impl/krate.rs | |
parent | 443ff27724855ffbfccad3513bb82d59e1a4f8ae (diff) | |
parent | 68ff52566d44e916868de1b52a9688182c26ebde (diff) |
Merge #549
549: remove Cancelable from module_tree_query r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/code_model_impl/krate.rs')
-rw-r--r-- | crates/ra_hir/src/code_model_impl/krate.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir/src/code_model_impl/krate.rs b/crates/ra_hir/src/code_model_impl/krate.rs index 3275eafed..712c6c86a 100644 --- a/crates/ra_hir/src/code_model_impl/krate.rs +++ b/crates/ra_hir/src/code_model_impl/krate.rs | |||
@@ -25,7 +25,7 @@ impl Crate { | |||
25 | let file_id = crate_graph.crate_root(self.crate_id); | 25 | let file_id = crate_graph.crate_root(self.crate_id); |
26 | let source_root_id = db.file_source_root(file_id); | 26 | let source_root_id = db.file_source_root(file_id); |
27 | let file_id = HirFileId::from(file_id); | 27 | let file_id = HirFileId::from(file_id); |
28 | let module_tree = db.module_tree(source_root_id)?; | 28 | let module_tree = db.module_tree(source_root_id); |
29 | // FIXME: teach module tree about crate roots instead of guessing | 29 | // FIXME: teach module tree about crate roots instead of guessing |
30 | let source = SourceItemId { | 30 | let source = SourceItemId { |
31 | file_id, | 31 | file_id, |