WIP: Fix breakage due to rust-lang/rust#76244

See rust-lang/rust#76244
Xanewok · Nov 18, 2020 · ade4b12 · ade4b12
1 parent 874d37d
commit ade4b12
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-09-10
+nightly-2020-09-15
diff --git a/src/translate.rs b/src/translate.rs
@@ -470,6 +470,8 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> {
                 self.translate(index_map, &c2),
             )
             .to_predicate(self.tcx),
+            // NOTE: Only used for Chalk trait solver
+            PredicateAtom::TypeWellFormedFromEnv(_) => return None,
         })
     }
 
@@ -503,7 +505,6 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> {
             .map(|target_preds| ParamEnv::new(
                 self.tcx.intern_predicates(&target_preds),
                 param_env.reveal(),
-                Some(orig_def_id),
             ))
     }