implement InternedRegionKind for rust analyzer

Author: Jamesbarford

compiler/rustc_hir_analysis/src/check/wfcheck.rs

@@ -3,9 +3,11 @@ use std::ops::{ControlFlow, Deref};
 
 use hir::intravisit::{self, Visitor};
 use rustc_abi::{ExternAbi, ScalableElt};
+use rustc_ast as ast;
 use rustc_data_structures::fx::{FxHashSet, FxIndexMap, FxIndexSet};
 use rustc_errors::codes::*;
 use rustc_errors::{Applicability, ErrorGuaranteed, msg, pluralize, struct_span_code_err};
+use rustc_hir as hir;
 use rustc_hir::attrs::{EiiDecl, EiiImpl, EiiImplResolution};
 use rustc_hir::def::{DefKind, Res};
 use rustc_hir::def_id::{DefId, LocalDefId};
@@ -38,7 +40,6 @@ use rustc_trait_selection::traits::{
     WellFormedLoc,
 };
 use tracing::{debug, instrument};
-use {rustc_ast as ast, rustc_hir as hir};
 
 use super::compare_eii::{compare_eii_function_types, compare_eii_statics};
 use crate::autoderef::Autoderef;

compiler/rustc_type_ir/src/predicate.rs

@@ -52,7 +52,7 @@ where
     feature = "nightly",
     derive(Decodable_NoContext, Encodable_NoContext, HashStable_NoContext)
 )]
-pub struct RegionEqPredicate<I: Interner>(pub I::Region, pub I::Region);
+pub struct RegionEqPredicate<I: Interner>(pub Region<I>, pub Region<I>);
 
 impl<I: Interner> RegionEqPredicate<I> {
     /// Decompose `'a == 'b` into `['a: 'b, 'b: 'a]`

src/tools/rust-analyzer/Cargo.lock

@@ -1215,6 +1215,7 @@ 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, SolverDefId, Term, Ty,
-    TyKind, Tys, Valtree, ValueConst,
+    ParamTy, PlaceholderConst, PlaceholderTy, PredefinedOpaques, Predicate, RegionKind,
+    SolverDefId, Term, Ty, TyKind, Tys, Valtree, ValueConst,
     abi::Safety,
     fold::{BoundVarReplacer, BoundVarReplacerDelegate, FnMutDelegate},
     generics::{Generics, generics},
@@ -1098,6 +1098,7 @@ 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,6 +20,8 @@ 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,6 +34,7 @@ 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>;
@@ -318,6 +319,14 @@ 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,6 +7,8 @@ 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::{