---

yaml
---
r: 164613
b: refs/heads/auto
c: 885f7ee
h: refs/heads/master
i:
  164611: 1050bbe
v: v3

Author: nikomatsakis

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: ff35eeb80a30ffbe3bcc334ed8accb97937676f4
+refs/heads/auto: 885f7ee12ec568ea2c3094407f8b1a94628b3853
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/middle/infer/higher_ranked/mod.rs

@@ -74,17 +74,7 @@ impl<'tcx,C> HigherRankedRelations<'tcx> for C
 
             // Second, we instantiate each bound region in the supertype with a
             // fresh concrete region.
-            let (b_prime, skol_map) = {
-                replace_late_bound_regions(self.tcx(), b, |br, _| {
-                    let skol =
-                        self.infcx().region_vars.new_skolemized(
-                            br, &snapshot.region_vars_snapshot);
-                    debug!("Bound region {} skolemized to {}",
-                           bound_region_to_string(self.tcx(), "", false, br),
-                           skol);
-                    skol
-                })
-            };
+            let (b_prime, skol_map) = skolemize_regions(self.infcx(), b, snapshot);
 
             debug!("a_prime={}", a_prime.repr(self.tcx()));
             debug!("b_prime={}", b_prime.repr(self.tcx()));
@@ -538,3 +528,23 @@ impl<'a,'tcx> InferCtxtExt<'tcx> for InferCtxt<'a,'tcx> {
         region_vars
     }
 }
+
+fn skolemize_regions<'a,'tcx,HR>(infcx: &InferCtxt<'a,'tcx>,
+                                 value: &HR,
+                                 snapshot: &CombinedSnapshot)
+                                 -> (HR, FnvHashMap<ty::BoundRegion,ty::Region>)
+    where HR : HigherRankedFoldable<'tcx>
+{
+    replace_late_bound_regions(infcx.tcx, value, |br, _| {
+        let skol =
+            infcx.region_vars.new_skolemized(
+                br,
+                &snapshot.region_vars_snapshot);
+
+        debug!("Bound region {} skolemized to {}",
+               bound_region_to_string(infcx.tcx, "", false, br),
+               skol);
+
+        skol
+    })
+}