fix def collector for impl trait

lcnr · lcnr · commit 8f13705e3b5c · 2020-10-07T10:19:04.000+02:00
diff --git a/compiler/rustc_resolve/src/def_collector.rs b/compiler/rustc_resolve/src/def_collector.rs
@@ -239,13 +239,13 @@ impl<'a, 'b> visit::Visitor<'a> for DefCollector<'a, 'b> {
 
     fn visit_ty(&mut self, ty: &'a Ty) {
         match ty.kind {
-            TyKind::MacCall(..) => return self.visit_macro_invoc(ty.id),
+            TyKind::MacCall(..) => self.visit_macro_invoc(ty.id),
             TyKind::ImplTrait(node_id, _) => {
-                self.create_def(node_id, DefPathData::ImplTrait, ty.span);
+                let parent_def = self.create_def(node_id, DefPathData::ImplTrait, ty.span);
+                self.with_parent(parent_def, |this| visit::walk_ty(this, ty));
             }
-            _ => {}
+            _ => visit::walk_ty(self, ty),
         }
-        visit::walk_ty(self, ty);
     }
 
     fn visit_stmt(&mut self, stmt: &'a Stmt) {

Original file line number	Diff line number	Diff line change
`@@ -239,13 +239,13 @@ impl<'a, 'b> visit::Visitor<'a> for DefCollector<'a, 'b> {`
`239`	`239`
`240`	`240`	`fn visit_ty(&mut self, ty: &'a Ty) {`
`241`	`241`	`match ty.kind {`
`242`		`- TyKind::MacCall(..) => return self.visit_macro_invoc(ty.id),`
	`242`	`+ TyKind::MacCall(..) => self.visit_macro_invoc(ty.id),`
`243`	`243`	`TyKind::ImplTrait(node_id, _) => {`
`244`		`- self.create_def(node_id, DefPathData::ImplTrait, ty.span);`
	`244`	`+ let parent_def = self.create_def(node_id, DefPathData::ImplTrait, ty.span);`
	`245`	`+ self.with_parent(parent_def, \|this\| visit::walk_ty(this, ty));`
`245`	`246`	`}`
`246`		`- _ => {}`
	`247`	`+ _ => visit::walk_ty(self, ty),`
`247`	`248`	`}`
`248`		`- visit::walk_ty(self, ty);`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`fn visit_stmt(&mut self, stmt: &'a Stmt) {`