Fixed errors caused due to API changes

Author: izagawd

compiler/rustc_const_eval/src/interpret/intrinsics.rs

@@ -13,7 +13,7 @@ use rustc_infer::infer::TyCtxtInferExt;
 use rustc_middle::mir::interpret::{CTFE_ALLOC_SALT, read_target_uint, write_target_uint};
 use rustc_middle::mir::{self, BinOp, ConstValue, NonDivergingIntrinsic};
 use rustc_middle::ty::layout::TyAndLayout;
-use rustc_middle::ty::{FloatTy, Ty, TyCtxt, TypeFoldable, Upcast};
+use rustc_middle::ty::{FloatTy, Ty, TyCtxt, TypeFoldable, PolyExistentialPredicate};
 use rustc_middle::{bug, span_bug, ty};
 use rustc_span::{Symbol, sym};
 use rustc_trait_selection::traits::{Obligation, ObligationCause, ObligationCtxt};
@@ -22,7 +22,7 @@ use tracing::trace;
 use super::memory::MemoryKind;
 use super::util::ensure_monomorphic_enough;
 use super::{
-    AllocId, Allocation, CheckInAllocMsg, ConstAllocation, ImmTy, InterpCx, InterpResult, Machine,
+    AllocId, CheckInAllocMsg, ImmTy, InterpCx, InterpResult, Machine,
     OpTy, PlaceTy, Pointer, PointerArithmetic, Provenance, Scalar, err_ub_custom, err_unsup_format,
     interp_ok, throw_inval, throw_ub_custom, throw_ub_format,
 };
@@ -228,7 +228,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
 
                 ensure_monomorphic_enough(tcx, tp_ty)?;
                 ensure_monomorphic_enough(tcx, result_ty)?;
-                let ty::Dynamic(preds, _, ty::Dyn) = result_ty.kind() else {
+                let ty::Dynamic(preds, _) = result_ty.kind() else {
                     span_bug!(
                         self.find_closest_untracked_caller_location(),
                         "Invalid type provided to vtable_for::<T, U>. U must be dyn Trait, got {result_ty}."
@@ -239,7 +239,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
                     self.tcx.infer_ctxt().build_with_typing_env(self.typing_env);
 
                 let ocx = ObligationCtxt::new(&infcx);
-                ocx.register_obligations(preds.iter().map(|pred| {
+                ocx.register_obligations(preds.iter().map(|pred: PolyExistentialPredicate<'_>| {
                     let pred = pred.with_self_ty(tcx, tp_ty);
                     // Lifetimes can only be 'static because of the bound on T
                     let pred = pred.fold_with(&mut ty::BottomUpFolder {
@@ -252,7 +252,7 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> {
                     });
                     Obligation::new(tcx, ObligationCause::dummy(), param_env, pred)
                 }));
-                let type_impls_trait = ocx.select_all_or_error().is_empty();
+                let type_impls_trait = ocx.evaluate_obligations_error_on_ambiguity().is_empty();
                 // Since `assumed_wf_tys=[]` the choice of LocalDefId is irrelevant, so using the "default"
                 let regions_are_valid = ocx.resolve_regions(CRATE_DEF_ID, param_env, []).is_empty();
 

compiler/rustc_type_ir/src/predicate.rs

@@ -293,9 +293,9 @@ impl<I: Interner> Eq for ExistentialPredicate<I> {}
 impl<I: Interner> ty::Binder<I, ExistentialPredicate<I>> {
     pub fn def_id(&self) -> I::DefId {
         match self.skip_binder() {
-            ExistentialPredicate::Trait(tr) => tr.def_id,
-            ExistentialPredicate::Projection(p) => p.def_id,
-            ExistentialPredicate::AutoTrait(did) => did,
+            ExistentialPredicate::Trait(tr) => tr.def_id.into(),
+            ExistentialPredicate::Projection(p) => p.def_id.into(),
+            ExistentialPredicate::AutoTrait(did) => did.into(),
         }
     }
     /// Given an existential predicate like `?Self: PartialEq<u32>` (e.g., derived from `dyn PartialEq<u32>`),