---

yaml
---
r: 164614
b: refs/heads/auto
c: 1b24602
h: refs/heads/master
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: 885f7ee12ec568ea2c3094407f8b1a94628b3853
+refs/heads/auto: 1b24602ca083cc20169190556a51066af0438049
 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

@@ -84,30 +84,17 @@ impl<'tcx,C> HigherRankedRelations<'tcx> for C
 
             // Presuming type comparison succeeds, we need to check
             // that the skolemized regions do not "leak".
-            let new_vars = self.infcx().region_vars_confined_to_snapshot(snapshot);
-            for (&skol_br, &skol) in skol_map.iter() {
-                let tainted = self.infcx().tainted_regions(snapshot, skol);
-                for tainted_region in tainted.iter() {
-                    // Each skolemized should only be relatable to itself
-                    // or new variables:
-                    match *tainted_region {
-                        ty::ReInfer(ty::ReVar(ref vid)) => {
-                            if new_vars.iter().any(|x| x == vid) { continue; }
-                        }
-                        _ => {
-                            if *tainted_region == skol { continue; }
-                        }
-                    };
-
-                    // A is not as polymorphic as B:
+            match leak_check(self.infcx(), &skol_map, snapshot) {
+                Ok(()) => { }
+                Err((skol_br, tainted_region)) => {
                     if self.a_is_expected() {
                         debug!("Not as polymorphic!");
                         return Err(ty::terr_regions_insufficiently_polymorphic(skol_br,
-                                                                               *tainted_region));
+                                                                               tainted_region));
                     } else {
                         debug!("Overly polymorphic!");
                         return Err(ty::terr_regions_overly_polymorphic(skol_br,
-                                                                       *tainted_region));
+                                                                       tainted_region));
                     }
                 }
             }
@@ -548,3 +535,30 @@ fn skolemize_regions<'a,'tcx,HR>(infcx: &InferCtxt<'a,'tcx>,
         skol
     })
 }
+
+fn leak_check<'a,'tcx>(infcx: &InferCtxt<'a,'tcx>,
+                       skol_map: &FnvHashMap<ty::BoundRegion,ty::Region>,
+                       snapshot: &CombinedSnapshot)
+                       -> Result<(),(ty::BoundRegion,ty::Region)>
+{
+    let new_vars = infcx.region_vars_confined_to_snapshot(snapshot);
+    for (&skol_br, &skol) in skol_map.iter() {
+        let tainted = infcx.tainted_regions(snapshot, skol);
+        for &tainted_region in tainted.iter() {
+            // Each skolemized should only be relatable to itself
+            // or new variables:
+            match tainted_region {
+                ty::ReInfer(ty::ReVar(vid)) => {
+                    if new_vars.iter().any(|&x| x == vid) { continue; }
+                }
+                _ => {
+                    if tainted_region == skol { continue; }
+                }
+            };
+
+            // A is not as polymorphic as B:
+            return Err((skol_br, tainted_region));
+        }
+    }
+    Ok(())
+}