Fix rebase issues

sgrif · sgrif · commit ce64f9d823bf · 2018-05-02T08:28:42.000-06:00
diff --git a/src/librustc/infer/region_constraints/mod.rs b/src/librustc/infer/region_constraints/mod.rs
@@ -851,6 +851,8 @@ impl<'tcx> RegionConstraintCollector<'tcx> {
             ty::ReVar(vid) => self.var_universe(vid),
             ty::ReLateBound(..) =>
                 bug!("universe(): encountered bound region {:?}", region),
+            ty::ReCanonical(..) =>
+                bug!("region_universe(): encountered canonical region {:?}", region),
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -851,6 +851,8 @@ impl<'tcx> RegionConstraintCollector<'tcx> {`
`851`	`851`	`ty::ReVar(vid) => self.var_universe(vid),`
`852`	`852`	`ty::ReLateBound(..) =>`
`853`	`853`	`bug!("universe(): encountered bound region {:?}", region),`
	`854`	`+ ty::ReCanonical(..) =>`
	`855`	`+ bug!("region_universe(): encountered canonical region {:?}", region),`
`854`	`856`	`}`
`855`	`857`	`}`
`856`	`858`