diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-09-13 14:40:48 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2019-09-13 14:40:48 +0100 |
commit | b8c16ec002d48f4fb9d883d091114ccd1286ba47 (patch) | |
tree | 5fa82899fc15f5739ef80997c04fd9cc8153e786 /crates/ra_hir/src/nameres/collector.rs | |
parent | b31f9872ec67d371d669967f9c95f2d71a9d6bf5 (diff) | |
parent | 7be7f67198c617ad482717d9bf2c7dca9c2cd169 (diff) |
Merge #1838
1838: rename add_resolution -> add_scope_def r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/nameres/collector.rs')
-rw-r--r-- | crates/ra_hir/src/nameres/collector.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir/src/nameres/collector.rs b/crates/ra_hir/src/nameres/collector.rs index 7d2f313c1..1446c49a0 100644 --- a/crates/ra_hir/src/nameres/collector.rs +++ b/crates/ra_hir/src/nameres/collector.rs | |||
@@ -243,7 +243,7 @@ where | |||
243 | &self, | 243 | &self, |
244 | module_id: CrateModuleId, | 244 | module_id: CrateModuleId, |
245 | import: &raw::ImportData, | 245 | import: &raw::ImportData, |
246 | ) -> (PerNs<ModuleDef>, ReachedFixedPoint) { | 246 | ) -> (PerNs, ReachedFixedPoint) { |
247 | log::debug!("resolving import: {:?} ({:?})", import, self.def_map.edition); | 247 | log::debug!("resolving import: {:?} ({:?})", import, self.def_map.edition); |
248 | if import.is_extern_crate { | 248 | if import.is_extern_crate { |
249 | let res = self.def_map.resolve_name_in_extern_prelude( | 249 | let res = self.def_map.resolve_name_in_extern_prelude( |
@@ -268,7 +268,7 @@ where | |||
268 | fn record_resolved_import( | 268 | fn record_resolved_import( |
269 | &mut self, | 269 | &mut self, |
270 | module_id: CrateModuleId, | 270 | module_id: CrateModuleId, |
271 | def: PerNs<ModuleDef>, | 271 | def: PerNs, |
272 | import_id: raw::ImportId, | 272 | import_id: raw::ImportId, |
273 | import: &raw::ImportData, | 273 | import: &raw::ImportData, |
274 | ) { | 274 | ) { |
@@ -662,7 +662,7 @@ where | |||
662 | }; | 662 | }; |
663 | } | 663 | } |
664 | let name = def.name.clone(); | 664 | let name = def.name.clone(); |
665 | let def: PerNs<ModuleDef> = match def.kind { | 665 | let def: PerNs = match def.kind { |
666 | raw::DefKind::Function(ast_id) => PerNs::values(def!(Function, ast_id)), | 666 | raw::DefKind::Function(ast_id) => PerNs::values(def!(Function, ast_id)), |
667 | raw::DefKind::Struct(ast_id) => { | 667 | raw::DefKind::Struct(ast_id) => { |
668 | let s = def!(Struct, ast_id); | 668 | let s = def!(Struct, ast_id); |