diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-23 18:57:10 +0100 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-23 18:57:10 +0100 |
commit | ffbb60436305c9ef8c8944188e0373122051c53a (patch) | |
tree | 3240bdb3aa75eb278f13b7294f01591181189135 /crates/ra_analysis/src/symbol_index.rs | |
parent | e49c628c0d7ab30a09e8d3ba3d7ac93ab967ff6d (diff) | |
parent | dc477db757247d5184250bffe9dd0c38dd867778 (diff) |
Merge #157
157: Introduce ModuleId r=matklad a=matklad
Previously, module was synonym with a file, and so a module could have
had several parents. This commit introduces a separate module concept,
such that each module has only one parent, but a single file can
correspond to different modules.
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_analysis/src/symbol_index.rs')
-rw-r--r-- | crates/ra_analysis/src/symbol_index.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_analysis/src/symbol_index.rs b/crates/ra_analysis/src/symbol_index.rs index a0f3c0437..1b7d9f779 100644 --- a/crates/ra_analysis/src/symbol_index.rs +++ b/crates/ra_analysis/src/symbol_index.rs | |||
@@ -34,7 +34,7 @@ impl Hash for SymbolIndex { | |||
34 | } | 34 | } |
35 | 35 | ||
36 | impl SymbolIndex { | 36 | impl SymbolIndex { |
37 | pub(crate) fn for_files(files: impl ParallelIterator<Item = (FileId, File)>) -> SymbolIndex { | 37 | pub(crate) fn for_files(files: impl Iterator<Item = (FileId, File)>) -> SymbolIndex { |
38 | let mut symbols = files | 38 | let mut symbols = files |
39 | .flat_map(|(file_id, file)| { | 39 | .flat_map(|(file_id, file)| { |
40 | file_symbols(&file) | 40 | file_symbols(&file) |
@@ -52,7 +52,7 @@ impl SymbolIndex { | |||
52 | } | 52 | } |
53 | 53 | ||
54 | pub(crate) fn for_file(file_id: FileId, file: File) -> SymbolIndex { | 54 | pub(crate) fn for_file(file_id: FileId, file: File) -> SymbolIndex { |
55 | SymbolIndex::for_files(::rayon::iter::once((file_id, file))) | 55 | SymbolIndex::for_files(::std::iter::once((file_id, file))) |
56 | } | 56 | } |
57 | } | 57 | } |
58 | 58 | ||