diff options
author | Aleksey Kladov <[email protected]> | 2019-12-21 16:22:48 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-12-21 16:26:28 +0000 |
commit | ec56f59ac17ad5ae797ce431883be8f31e795d1b (patch) | |
tree | 82cfed150ad966674e6291010b9b976239351a42 /crates/ra_hir_def/src/nameres | |
parent | 6d8a2ec3dd350541d7c0e5aa08795a42c4dbd8f8 (diff) |
Remove import from resolution
Diffstat (limited to 'crates/ra_hir_def/src/nameres')
-rw-r--r-- | crates/ra_hir_def/src/nameres/collector.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs index 45199fa11..c2db5472b 100644 --- a/crates/ra_hir_def/src/nameres/collector.rs +++ b/crates/ra_hir_def/src/nameres/collector.rs | |||
@@ -219,7 +219,7 @@ where | |||
219 | self.update( | 219 | self.update( |
220 | self.def_map.root, | 220 | self.def_map.root, |
221 | None, | 221 | None, |
222 | &[(name, Resolution { def: PerNs::macros(macro_), import: None })], | 222 | &[(name, Resolution { def: PerNs::macros(macro_), import: false })], |
223 | ); | 223 | ); |
224 | } | 224 | } |
225 | } | 225 | } |
@@ -404,7 +404,7 @@ where | |||
404 | let variant = EnumVariantId { parent: e, local_id }; | 404 | let variant = EnumVariantId { parent: e, local_id }; |
405 | let res = Resolution { | 405 | let res = Resolution { |
406 | def: PerNs::both(variant.into(), variant.into()), | 406 | def: PerNs::both(variant.into(), variant.into()), |
407 | import: Some(import_id), | 407 | import: true, |
408 | }; | 408 | }; |
409 | (name, res) | 409 | (name, res) |
410 | }) | 410 | }) |
@@ -431,7 +431,7 @@ where | |||
431 | } | 431 | } |
432 | } | 432 | } |
433 | 433 | ||
434 | let resolution = Resolution { def, import: Some(import_id) }; | 434 | let resolution = Resolution { def, import: true }; |
435 | self.update(module_id, Some(import_id), &[(name, resolution)]); | 435 | self.update(module_id, Some(import_id), &[(name, resolution)]); |
436 | } | 436 | } |
437 | None => tested_by!(bogus_paths), | 437 | None => tested_by!(bogus_paths), |
@@ -719,7 +719,7 @@ where | |||
719 | def: PerNs::types( | 719 | def: PerNs::types( |
720 | ModuleId { krate: self.def_collector.def_map.krate, local_id: res }.into(), | 720 | ModuleId { krate: self.def_collector.def_map.krate, local_id: res }.into(), |
721 | ), | 721 | ), |
722 | import: None, | 722 | import: false, |
723 | }; | 723 | }; |
724 | self.def_collector.update(self.module_id, None, &[(name, resolution)]); | 724 | self.def_collector.update(self.module_id, None, &[(name, resolution)]); |
725 | res | 725 | res |
@@ -791,7 +791,7 @@ where | |||
791 | PerNs::types(def.into()) | 791 | PerNs::types(def.into()) |
792 | } | 792 | } |
793 | }; | 793 | }; |
794 | let resolution = Resolution { def, import: None }; | 794 | let resolution = Resolution { def, import: false }; |
795 | self.def_collector.update(self.module_id, None, &[(name, resolution)]) | 795 | self.def_collector.update(self.module_id, None, &[(name, resolution)]) |
796 | } | 796 | } |
797 | 797 | ||