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

See rust-lang/rust#74113
Xanewok · Nov 18, 2020 · f58afc6 · f58afc6
1 parent 2eec4e1
commit f58afc6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-07-15
+nightly-2020-07-23
diff --git a/src/translate.rs b/src/translate.rs
@@ -366,7 +366,7 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> {
     ) -> Option<Predicate<'tcx>> {
         use rustc_middle::ty::{
             Binder, OutlivesPredicate, PredicateKind, ProjectionPredicate, ProjectionTy,
-            SubtypePredicate, ToPredicate, TraitPredicate,
+            SubtypePredicate, ToPredicate, TraitPredicate, WithOptConstParam,
         };
 
         Some(match predicate.kind() {
@@ -450,11 +450,14 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> {
                 }))
                 .to_predicate(self.tcx)
             }
-            PredicateKind::ConstEvaluatable(orig_did, orig_substs) => {
+            PredicateKind::ConstEvaluatable(param, orig_substs) => {
                 if let Some((target_def_id, target_substs)) =
-                    self.translate_orig_substs(index_map, *orig_did, orig_substs)
+                    self.translate_orig_substs(index_map, param.did, orig_substs)
                 {
-                    PredicateKind::ConstEvaluatable(target_def_id, target_substs)
+                    // TODO: We could probably use translated version for
+                    // `WithOptConstParam::const_param_did`
+                    let const_param = WithOptConstParam::unknown(target_def_id);
+                    PredicateKind::ConstEvaluatable(const_param, target_substs)
                         .to_predicate(self.tcx)
                 } else {
                     return None;