aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/nameres/collector.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2019-09-13 14:38:59 +0100
committerAleksey Kladov <[email protected]>2019-09-13 14:38:59 +0100
commit2fbe79ed9adaeb93e0c9b8bc1d7f67dff075b8dd (patch)
tree319ebb277cb714e2dd648b9e1c38477ffb0a2dcf /crates/ra_hir/src/nameres/collector.rs
parent51e2d76b9839410020c75ac02ad602675b0a5aa9 (diff)
make PerNs non-generic
Diffstat (limited to 'crates/ra_hir/src/nameres/collector.rs')
-rw-r--r--crates/ra_hir/src/nameres/collector.rs6
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);