fix rust-lang/rust#112938

it's quite unsightly and maybe it would be better to use directly Clauses instead of Predicates (from rustc_middle::ty),
Also, it might be the reason the translation is a bit shuffled, so, maybe it would be better to change those modifications

Author: floriangru

creusot/src/ctx.rs

@@ -29,7 +29,10 @@ use rustc_infer::traits::{Obligation, ObligationCause};
 use rustc_middle::{
     mir::{Body, Promoted},
     thir,
-    ty::{subst::InternalSubsts, GenericArg, ParamEnv, SubstsRef, Ty, TyCtxt, Visibility},
+    ty::{
+        subst::InternalSubsts, Clause, GenericArg, ParamEnv, Predicate, SubstsRef, Ty, TyCtxt,
+        Visibility,
+    },
 };
 use rustc_span::{RealFileName, Span, Symbol, DUMMY_SP};
 use rustc_trait_selection::traits::SelectionContext;
@@ -354,9 +357,17 @@ impl<'tcx, 'sess> TranslationCtx<'tcx> {
                 }
             }
 
-            additional_predicates.extend(base_env.caller_bounds());
+            additional_predicates.extend::<Vec<Predicate>>(
+                base_env.caller_bounds().into_iter().map(Clause::as_predicate).collect(),
+            );
             ParamEnv::new(
-                self.mk_predicates(&additional_predicates),
+                self.mk_clauses(
+                    &(additional_predicates
+                        .into_iter()
+                        .map(Predicate::expect_clause)
+                        .collect::<Vec<Clause>>()
+                        .as_slice()),
+                ),
                 rustc_infer::traits::Reveal::UserFacing,
                 rustc_hir::Constness::NotConst,
             )

creusot/src/translation/external.rs

@@ -10,7 +10,7 @@ use rustc_middle::{
     thir::{self, visit::Visitor, Expr, ExprKind, Thir},
     ty::{
         subst::{GenericArgKind, InternalSubsts, SubstsRef},
-        EarlyBinder, Predicate, TyCtxt, TyKind,
+        Clause, EarlyBinder, Predicate, TyCtxt, TyKind,
     },
 };
 use rustc_span::Symbol;
@@ -131,8 +131,13 @@ pub(crate) fn extract_extern_specs_from_item<'tcx>(
 
     let contract = crate::specification::contract_clauses_of(ctx, def_id.to_def_id()).unwrap();
 
-    let additional_predicates =
-        ctx.predicates_of(def_id).instantiate(ctx.tcx, subst).predicates.into_iter().collect();
+    let additional_predicates = ctx
+        .predicates_of(def_id)
+        .instantiate(ctx.tcx, subst)
+        .predicates
+        .into_iter()
+        .map(Clause::as_predicate)
+        .collect();
 
     let arg_subst = ctx
         .fn_arg_names(def_id)

creusot/src/translation/traits.rs

@@ -305,7 +305,7 @@ pub(crate) fn resolve_assoc_item_opt<'tcx>(
             Some((leaf_def.item.def_id, leaf_substs))
         }
         ImplSource::Param(_, _) => Some((def_id, substs)),
-        ImplSource::Builtin(impl_data) => match *substs.type_at(0).kind() {
+        ImplSource::Builtin(_) => match *substs.type_at(0).kind() {
             rustc_middle::ty::Closure(closure_def_id, closure_substs) => {
                 Some((closure_def_id, closure_substs))
             }