Fix post-rebase build failures

sgrif · sgrif · commit 73589932c6fa · 2018-01-31T15:02:11.000-07:00
diff --git a/src/librustc/infer/region_constraints/mod.rs b/src/librustc/infer/region_constraints/mod.rs
@@ -232,7 +232,7 @@ type CombineMap<'tcx> = FxHashMap<TwoRegions<'tcx>, RegionVid>;
 
 pub struct RegionSnapshot {
     length: usize,
-    region_snapshot: unify::Snapshot<ty::RegionVid>,
+    region_snapshot: ut::Snapshot<ut::InPlace<ty::RegionVid>>,
     skolemization_count: u32,
 }
 

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ type CombineMap<'tcx> = FxHashMap<TwoRegions<'tcx>, RegionVid>;`
`232`	`232`
`233`	`233`	`pub struct RegionSnapshot {`
`234`	`234`	`length: usize,`
`235`		`- region_snapshot: unify::Snapshot<ty::RegionVid>,`
	`235`	`+ region_snapshot: ut::Snapshot<ut::InPlace<ty::RegionVid>>,`
`236`	`236`	`skolemization_count: u32,`
`237`	`237`	`}`
`238`	`238`