Fix compilation for latest nightly

Author: nbdd0121

src/mir.rs

@@ -71,8 +71,7 @@ fn remap_mir_for_const_eval_select<'tcx>(
                 fn_span,
                 ..
             } if let ty::FnDef(def_id, _) = *const_.ty().kind()
-                && tcx.item_name(def_id) == sym::const_eval_select
-                && tcx.is_intrinsic(def_id) =>
+                && matches!(tcx.intrinsic(def_id), Some(sym::const_eval_select)) =>
             {
                 let [tupled_args, called_in_const, called_at_rt]: [_; 3] =
                     std::mem::take(args).try_into().unwrap();

src/preempt_count/check.rs

@@ -502,7 +502,7 @@ memoize!(
                     .predicates
                     .into_iter()
                     .filter_map(|(pred, _)| {
-                        pred.subst_supertrait(cx.tcx, &trait_ref).as_trait_clause()
+                        pred.instantiate_supertrait(cx.tcx, &trait_ref).as_trait_clause()
                     });
                 for supertrait in super_traits {
                     if visited.insert(supertrait.to_predicate(cx.tcx)) {