Fix breakage due to rust-lang/rust#73978

rust-lang/rust#73978
Xanewok · Nov 18, 2020 · 2eec4e1 · 2eec4e1
1 parent b8f4d24
commit 2eec4e1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-07-07
+nightly-2020-07-15
diff --git a/src/translate.rs b/src/translate.rs
@@ -494,10 +494,13 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> {
         orig_def_id: DefId,
         param_env: ParamEnv<'tcx>,
     ) -> Option<ParamEnv<'tcx>> {
-        self.translate_predicates(orig_def_id, param_env.caller_bounds)
-            .map(|target_preds| ParamEnv {
-                caller_bounds: self.tcx.intern_predicates(&target_preds),
-                ..param_env
+        self.translate_predicates(orig_def_id, param_env.caller_bounds())
+            .map(|target_preds| {
+                ParamEnv::new(
+                    self.tcx.intern_predicates(&target_preds),
+                    param_env.reveal(),
+                    Some(orig_def_id),
+                )
             })
     }
 

diff --git a/src/traverse.rs b/src/traverse.rs
@@ -591,7 +591,7 @@ fn diff_traits<'tcx>(
     let mut old_sealed = false;
     let old_param_env = tcx.param_env(old);
 
-    for bound in old_param_env.caller_bounds {
+    for bound in old_param_env.caller_bounds() {
         if let PredicateKind::Trait(pred, _) = *bound.kind() {
             let trait_ref = pred.skip_binder().trait_ref;