Undo rust-analyser changes

Author: Jamesbarford

src/tools/rust-analyzer/Cargo.lock

@@ -1215,7 +1215,6 @@ version = "0.0.0"
 dependencies = [
  "dashmap",
  "hashbrown 0.14.5",
- "ra-ap-rustc_type_ir",
  "rayon",
  "rustc-hash 2.1.1",
  "triomphe",

src/tools/rust-analyzer/crates/hir-ty/src/next_solver/interner.rs

@@ -53,8 +53,8 @@ use crate::{
 use super::{
     Binder, BoundExistentialPredicates, BoundTy, BoundTyKind, Clause, ClauseKind, Clauses, Const,
     ErrorGuaranteed, ExprConst, ExternalConstraints, GenericArg, GenericArgs, ParamConst, ParamEnv,
-    ParamTy, PlaceholderConst, PlaceholderTy, PredefinedOpaques, Predicate, RegionKind,
-    SolverDefId, Term, Ty, TyKind, Tys, Valtree, ValueConst,
+    ParamTy, PlaceholderConst, PlaceholderTy, PredefinedOpaques, Predicate, SolverDefId, Term, Ty,
+    TyKind, Tys, Valtree, ValueConst,
     abi::Safety,
     fold::{BoundVarReplacer, BoundVarReplacerDelegate, FnMutDelegate},
     generics::{Generics, generics},
@@ -1098,7 +1098,6 @@ impl<'db> Interner for DbInterner<'db> {
     type LateParamRegion = LateParamRegion;
     type BoundRegion = BoundRegion;
     type PlaceholderRegion = PlaceholderRegion;
-    type InternedRegionKind = InternedRef<'db, RegionKind<'db>>;
 
     type RegionAssumptions = RegionAssumptions<'db>;
 

src/tools/rust-analyzer/crates/intern/Cargo.toml

@@ -20,8 +20,6 @@ rustc-hash.workspace = true
 triomphe.workspace = true
 rayon.workspace = true
 
-ra-ap-rustc_type_ir.workspace = true
-
 [lints]
 workspace = true
 

src/tools/rust-analyzer/crates/intern/src/intern.rs

@@ -34,7 +34,6 @@ use std::{
 use dashmap::{DashMap, SharedValue};
 use hashbrown::raw::RawTable;
 use rustc_hash::FxBuildHasher;
-use rustc_type_ir::inherent::IntoKind;
 use triomphe::{Arc, ArcBorrow};
 
 type InternMap<T> = DashMap<Arc<T>, (), FxBuildHasher>;
@@ -319,14 +318,6 @@ impl<T: Display> Display for InternedRef<'_, T> {
     }
 }
 
-impl<T: Clone> IntoKind for InternedRef<'_, T> {
-    type Kind = T;
-
-    fn kind(self) -> Self::Kind {
-        self.arc.get().clone()
-    }
-}
-
 pub struct InternStorage<T: ?Sized> {
     map: OnceLock<InternMap<T>>,
 }

src/tools/rust-analyzer/crates/intern/src/lib.rs

@@ -7,8 +7,6 @@ mod intern;
 mod intern_slice;
 mod symbol;
 
-extern crate ra_ap_rustc_type_ir as rustc_type_ir;
-
 pub use self::gc::{GarbageCollector, GcInternedSliceVisit, GcInternedVisit};
 pub use self::intern::{InternStorage, Internable, Interned, InternedRef, impl_internable};
 pub use self::intern_slice::{