Re-add set_current_program

Author: jackh726

Cargo.lock

@@ -36,7 +36,6 @@ rustc_apfloat = "0.2.3"
 query-group.workspace = true
 salsa.workspace = true
 salsa-macros.workspace = true
-extension-traits = "2.0.0"
 
 ra-ap-rustc_abi.workspace = true
 ra-ap-rustc_index.workspace = true

crates/hir-ty/Cargo.toml

@@ -15,7 +15,6 @@ use crate::next_solver::{
         traits::{Obligation, PredicateObligations},
     },
 };
-use extension_traits::extension;
 use rustc_type_ir::{
     AliasRelationDirection, AliasTyKind, BoundVar, GenericArgKind, InferTy, TypeFoldable, Upcast,
     Variance,
@@ -26,10 +25,23 @@ use rustc_type_ir::{
     },
 };
 
+pub trait CanonicalExt<'db, V> {
+    fn instantiate(&self, tcx: DbInterner<'db>, var_values: &CanonicalVarValues<'db>) -> V
+    where
+        V: TypeFoldable<DbInterner<'db>>;
+    fn instantiate_projected<T>(
+        &self,
+        tcx: DbInterner<'db>,
+        var_values: &CanonicalVarValues<'db>,
+        projection_fn: impl FnOnce(&V) -> T,
+    ) -> T
+    where
+        T: TypeFoldable<DbInterner<'db>>;
+}
+
 /// FIXME(-Znext-solver): This or public because it is shared with the
 /// new trait solver implementation. We should deduplicate canonicalization.
-#[extension(pub trait CanonicalExt)]
-impl<'db, V> Canonical<'db, V> {
+impl<'db, V> CanonicalExt<'db, V> for Canonical<'db, V> {
     /// Instantiate the wrapped value, replacing each canonical value
     /// with the value given in `var_values`.
     fn instantiate(&self, tcx: DbInterner<'db>, var_values: &CanonicalVarValues<'db>) -> V

crates/hir-ty/src/next_solver/infer/canonical/instantiate.rs

@@ -8,7 +8,6 @@ pub use SubregionOrigin::*;
 pub use at::DefineOpaqueTypes;
 use ena::undo_log::UndoLogs;
 use ena::unify as ut;
-use extension_traits::extension;
 use intern::Symbol;
 use opaque_types::{OpaqueHiddenType, OpaqueTypeStorage};
 use region_constraints::{
@@ -440,8 +439,11 @@ pub struct InferCtxtBuilder<'db> {
     interner: DbInterner<'db>,
 }
 
-#[extension(pub trait DbInternerInferExt)]
-impl<'db> DbInterner<'db> {
+pub trait DbInternerInferExt<'db> {
+    fn infer_ctxt(self) -> InferCtxtBuilder<'db>;
+}
+
+impl<'db> DbInternerInferExt<'db> for DbInterner<'db> {
     fn infer_ctxt(self) -> InferCtxtBuilder<'db> {
         InferCtxtBuilder { interner: self }
     }

crates/hir-ty/src/next_solver/infer/mod.rs

@@ -2,7 +2,6 @@ use std::iter;
 use std::ops::{self, ControlFlow};
 
 use base_db::Crate;
-use extension_traits::extension;
 use hir_def::lang_item::LangItem;
 use hir_def::{BlockId, HasModule, ItemContainerId, Lookup};
 use intern::sym;
@@ -72,8 +71,17 @@ impl<'db> Discr<'db> {
     }
 }
 
-#[extension(pub trait IntegerTypeExt)]
-impl IntegerType {
+pub trait IntegerTypeExt {
+    fn to_ty<'db>(&self, interner: DbInterner<'db>) -> Ty<'db>;
+    fn initial_discriminant<'db>(&self, interner: DbInterner<'db>) -> Discr<'db>;
+    fn disr_incr<'db>(
+        &self,
+        interner: DbInterner<'db>,
+        val: Option<Discr<'db>>,
+    ) -> Option<Discr<'db>>;
+}
+
+impl IntegerTypeExt for IntegerType {
     fn to_ty<'db>(&self, interner: DbInterner<'db>) -> Ty<'db> {
         match self {
             IntegerType::Pointer(true) => Ty::new(interner, TyKind::Int(IntTy::Isize)),
@@ -101,8 +109,20 @@ impl IntegerType {
     }
 }
 
-#[extension(pub trait IntegerExt)]
-impl Integer {
+pub trait IntegerExt {
+    fn to_ty<'db>(&self, interner: DbInterner<'db>, signed: bool) -> Ty<'db>;
+    fn from_int_ty<C: HasDataLayout>(cx: &C, ity: IntTy) -> Integer;
+    fn from_uint_ty<C: HasDataLayout>(cx: &C, ity: UintTy) -> Integer;
+    fn repr_discr<'db>(
+        interner: DbInterner<'db>,
+        ty: Ty<'db>,
+        repr: &ReprOptions,
+        min: i128,
+        max: i128,
+    ) -> (Integer, bool);
+}
+
+impl IntegerExt for Integer {
     #[inline]
     fn to_ty<'db>(&self, interner: DbInterner<'db>, signed: bool) -> Ty<'db> {
         use Integer::*;
@@ -192,8 +212,12 @@ impl Integer {
     }
 }
 
-#[extension(pub trait FloatExt)]
-impl Float {
+pub trait FloatExt {
+    fn to_ty<'db>(&self, interner: DbInterner<'db>) -> Ty<'db>;
+    fn from_float_ty(fty: FloatTy) -> Self;
+}
+
+impl FloatExt for Float {
     #[inline]
     fn to_ty<'db>(&self, interner: DbInterner<'db>) -> Ty<'db> {
         use Float::*;
@@ -216,8 +240,12 @@ impl Float {
     }
 }
 
-#[extension(pub trait PrimitiveExt)]
-impl Primitive {
+pub trait PrimitiveExt {
+    fn to_ty<'db>(&self, interner: DbInterner<'db>) -> Ty<'db>;
+    fn to_int_ty<'db>(&self, interner: DbInterner<'db>) -> Ty<'db>;
+}
+
+impl PrimitiveExt for Primitive {
     #[inline]
     fn to_ty<'db>(&self, interner: DbInterner<'db>) -> Ty<'db> {
         match *self {
@@ -254,8 +282,11 @@ impl<'db> HasDataLayout for DbInterner<'db> {
     }
 }
 
-#[extension(pub trait CoroutineArgsExt)]
-impl<'db> CoroutineArgs<DbInterner<'db>> {
+pub trait CoroutineArgsExt<'db> {
+    fn discr_ty(&self, interner: DbInterner<'db>) -> Ty<'db>;
+}
+
+impl<'db> CoroutineArgsExt<'db> for CoroutineArgs<DbInterner<'db>> {
     /// The type of the state discriminant used in the coroutine type.
     #[inline]
     fn discr_ty(&self, interner: DbInterner<'db>) -> Ty<'db> {