Rustup to rust-lang/rust#87648

dario23 · May 6, 2022 · 9663612 · 9663612
1 parent 8e92282
commit 9663612
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/rust-toolchain b/rust-toolchain
@@ -1,4 +1,4 @@
 # NOTE: Keep in sync with nightly date on README
 [toolchain]
-channel = "nightly-2022-01-17"
+channel = "nightly-2022-01-19"
 components = ["llvm-tools-preview", "rustc-dev"]
diff --git a/src/translate.rs b/src/translate.rs
@@ -8,7 +8,7 @@ use rustc_infer::infer::InferCtxt;
 use rustc_middle::ty::{
     fold::{BottomUpFolder, TypeFoldable, TypeFolder},
     subst::{GenericArg, InternalSubsts, SubstsRef},
-    GenericParamDefKind, ParamEnv, Predicate, Region, TraitRef, Ty, TyCtxt, Unevaluated,
+    GenericParamDefKind, ParamEnv, Predicate, Region, Term, TraitRef, Ty, TyCtxt, Unevaluated,
 };
 use std::collections::HashMap;
 
@@ -261,7 +261,7 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> {
                                                     substs: self
                                                         .tcx
                                                         .intern_substs(&target_substs[1..]),
-                                                    ty,
+                                                    term: Term::Ty(ty),
                                                 })
                                             } else {
                                                 success.set(false);
@@ -420,7 +420,10 @@ impl<'a, 'tcx> TranslationContext<'a, 'tcx> {
                             substs: target_substs,
                             item_def_id: target_def_id,
                         },
-                        ty: self.translate(index_map, pred.ty),
+                        term: match pred.term {
+                            Term::Ty(ty) => Term::Ty(self.translate(index_map, ty)),
+                            Term::Const(_) => pred.term,
+                        },
                     }
                 } else {
                     return None;