diff options
author | Aleksey Kladov <[email protected]> | 2019-03-14 09:54:03 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-03-17 09:52:05 +0000 |
commit | c7259a899c1709753dcda0fb117e2f7cc30a4d6e (patch) | |
tree | 410be0a8db17aca2d9878b0b2ac36d1921660990 /crates/ra_hir/src/nameres/crate_def_map | |
parent | 71e5adf694a4b253bc5bb48be96bb6ba08002d8c (diff) |
remove ItemMap
Diffstat (limited to 'crates/ra_hir/src/nameres/crate_def_map')
-rw-r--r-- | crates/ra_hir/src/nameres/crate_def_map/collector.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/ra_hir/src/nameres/crate_def_map/collector.rs b/crates/ra_hir/src/nameres/crate_def_map/collector.rs index 68f74b866..8b727e2c9 100644 --- a/crates/ra_hir/src/nameres/crate_def_map/collector.rs +++ b/crates/ra_hir/src/nameres/crate_def_map/collector.rs | |||
@@ -26,9 +26,9 @@ pub(super) fn collect_defs( | |||
26 | } | 26 | } |
27 | // look for the prelude | 27 | // look for the prelude |
28 | if def_map.prelude.is_none() { | 28 | if def_map.prelude.is_none() { |
29 | let item_map = db.item_map(dep.krate); | 29 | let map = db.crate_def_map(dep.krate); |
30 | if item_map.prelude.is_some() { | 30 | if map.prelude.is_some() { |
31 | def_map.prelude = item_map.prelude; | 31 | def_map.prelude = map.prelude; |
32 | } | 32 | } |
33 | } | 33 | } |
34 | } | 34 | } |
@@ -162,8 +162,8 @@ where | |||
162 | } else if m.krate != self.def_map.krate { | 162 | } else if m.krate != self.def_map.krate { |
163 | tested_by!(glob_across_crates); | 163 | tested_by!(glob_across_crates); |
164 | // glob import from other crate => we can just import everything once | 164 | // glob import from other crate => we can just import everything once |
165 | let item_map = self.db.item_map(m.krate); | 165 | let item_map = self.db.crate_def_map(m.krate); |
166 | let scope = &item_map[m.module_id]; | 166 | let scope = &item_map[m.module_id].scope; |
167 | let items = scope | 167 | let items = scope |
168 | .items | 168 | .items |
169 | .iter() | 169 | .iter() |