Fix test failure due to rust-lang/rust#72493

See rust-lang/rust#72493
Xanewok · Nov 19, 2020 · 0d52c24 · 0d52c24
1 parent 7b1387f
commit 0d52c24
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-06-23
+nightly-2020-06-24
diff --git a/src/typeck.rs b/src/typeck.rs
@@ -221,13 +221,18 @@ impl<'a, 'tcx> TypeComparisonContext<'a, 'tcx> {
         use rustc_infer::infer::{InferOk, RegionckMode};
         use rustc_middle::ty::Lift;
 
-        let error = self
-            .infcx
-            .at(&ObligationCause::dummy(), target_param_env)
-            .eq(orig, target)
-            .map(|InferOk { obligations: o, .. }| {
-                assert_eq!(o, vec![]);
-            });
+        let error = self.infcx.commit_if_ok(|snapshot| {
+            let select = self
+                .infcx
+                .at(&ObligationCause::dummy(), target_param_env)
+                .eq(orig, target)
+                .map(|InferOk { obligations: o, .. }| {
+                    assert_eq!(o, vec![]);
+                });
+            // check for unresolvable lifetime constraints
+            let leak_check = self.infcx.leak_check(false, snapshot);
+            select.and(leak_check)
+        });
 
         if let Err(err) = error {
             let outlives_env = OutlivesEnvironment::new(target_param_env);