fix rebase

estebank · estebank · commit c52dbbc64354 · 2020-05-27T16:28:20.000-07:00
diff --git a/src/librustc_infer/infer/error_reporting/nice_region_error/trait_impl_difference.rs b/src/librustc_infer/infer/error_reporting/nice_region_error/trait_impl_difference.rs
@@ -146,7 +146,7 @@ struct TypeParamSpanVisitor<'tcx> {
 }
 
 impl Visitor<'tcx> for TypeParamSpanVisitor<'tcx> {
-    type Map = hir::intravisit::Map<'tcx>;
+    type Map = rustc_middle::hir::map::Map<'tcx>;
 
     fn nested_visit_map(&mut self) -> hir::intravisit::NestedVisitorMap<Self::Map> {
         hir::intravisit::NestedVisitorMap::OnlyBodies(self.tcx.hir())

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ struct TypeParamSpanVisitor<'tcx> {`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`impl Visitor<'tcx> for TypeParamSpanVisitor<'tcx> {`
`149`		`- type Map = hir::intravisit::Map<'tcx>;`
	`149`	`+ type Map = rustc_middle::hir::map::Map<'tcx>;`
`150`	`150`
`151`	`151`	`fn nested_visit_map(&mut self) -> hir::intravisit::NestedVisitorMap<Self::Map> {`
`152`	`152`	`hir::intravisit::NestedVisitorMap::OnlyBodies(self.tcx.hir())`