about summary refs log tree commit diff
path: root/src/librustc/infer
diff options
context:
space:
mode:
authorscalexm <alexandre@scalexm.fr>2018-10-22 22:38:51 +0200
committerscalexm <alexandre@scalexm.fr>2018-11-03 11:41:51 +0100
commitd0447550dabc1b5fee1bde2a2663ebe15d6bbf2a (patch)
treed0bf02333e6f9dd50ae81b4906417eab6bd655a3 /src/librustc/infer
parent1003b7f85e75e3a726adc34b9c315e98094176d5 (diff)
downloadrust-d0447550dabc1b5fee1bde2a2663ebe15d6bbf2a.tar.gz
rust-d0447550dabc1b5fee1bde2a2663ebe15d6bbf2a.zip
Shift both late bound regions and bound types
Diffstat (limited to 'src/librustc/infer')
-rw-r--r--src/librustc/infer/outlives/obligations.rs2
-rw-r--r--src/librustc/infer/sub.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/librustc/infer/outlives/obligations.rs b/src/librustc/infer/outlives/obligations.rs
index 5db850f1588..523f03c2cfc 100644
--- a/src/librustc/infer/outlives/obligations.rs
+++ b/src/librustc/infer/outlives/obligations.rs
@@ -305,7 +305,7 @@ where
             ty, region, origin
         );
 
-        assert!(!ty.has_escaping_regions());
+        assert!(!ty.has_escaping_bound_vars());
 
         let components = self.tcx.outlives_components(ty);
         self.components_must_outlive(origin, components, region);
diff --git a/src/librustc/infer/sub.rs b/src/librustc/infer/sub.rs
index 048810c0427..3b0f9a5e545 100644
--- a/src/librustc/infer/sub.rs
+++ b/src/librustc/infer/sub.rs
@@ -84,8 +84,8 @@ impl<'combine, 'infcx, 'gcx, 'tcx> TypeRelation<'infcx, 'gcx, 'tcx>
                 // Shouldn't have any LBR here, so we can safely put
                 // this under a binder below without fear of accidental
                 // capture.
-                assert!(!a.has_escaping_regions());
-                assert!(!b.has_escaping_regions());
+                assert!(!a.has_escaping_bound_vars());
+                assert!(!b.has_escaping_bound_vars());
 
                 // can't make progress on `A <: B` if both A and B are
                 // type variables, so record an obligation. We also