diff options
author | Aleksey Kladov <[email protected]> | 2019-03-14 10:14:54 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-03-17 09:52:52 +0000 |
commit | b2a6c1736295a5fffa5ac0d0fee835cdc719ada3 (patch) | |
tree | 56fd27197126f11011fe9030cd9bfb80e142e709 /crates/ra_hir/src/nameres/crate_def_map/collector.rs | |
parent | c7259a899c1709753dcda0fb117e2f7cc30a4d6e (diff) |
remove lower module
Diffstat (limited to 'crates/ra_hir/src/nameres/crate_def_map/collector.rs')
-rw-r--r-- | crates/ra_hir/src/nameres/crate_def_map/collector.rs | 9 |
1 files changed, 8 insertions, 1 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 8b727e2c9..0f500ce42 100644 --- a/crates/ra_hir/src/nameres/crate_def_map/collector.rs +++ b/crates/ra_hir/src/nameres/crate_def_map/collector.rs | |||
@@ -224,7 +224,7 @@ where | |||
224 | } | 224 | } |
225 | } | 225 | } |
226 | let resolution = Resolution { def, import: Some(import_id) }; | 226 | let resolution = Resolution { def, import: Some(import_id) }; |
227 | self.update(module_id, None, &[(name, resolution)]); | 227 | self.update(module_id, Some(import_id), &[(name, resolution)]); |
228 | } | 228 | } |
229 | } | 229 | } |
230 | 230 | ||
@@ -262,6 +262,13 @@ where | |||
262 | existing.import = import.or(res.import); | 262 | existing.import = import.or(res.import); |
263 | changed = true; | 263 | changed = true; |
264 | } | 264 | } |
265 | if existing.def.is_none() | ||
266 | && res.def.is_none() | ||
267 | && existing.import.is_none() | ||
268 | && res.import.is_some() | ||
269 | { | ||
270 | existing.import = res.import; | ||
271 | } | ||
265 | } | 272 | } |
266 | if !changed { | 273 | if !changed { |
267 | return; | 274 | return; |