Update Region outside of ./compiler

Author: Jamesbarford

src/librustdoc/clean/auto_trait.rs

@@ -3,7 +3,7 @@ use rustc_data_structures::thin_vec::ThinVec;
 use rustc_hir as hir;
 use rustc_infer::infer::region_constraints::{ConstraintKind, RegionConstraintData};
 use rustc_middle::bug;
-use rustc_middle::ty::{self, Region, Ty, fold_regions};
+use rustc_middle::ty::{self, Region, RegionUtilitiesExt, Ty, fold_regions};
 use rustc_span::def_id::DefId;
 use rustc_span::symbol::{Symbol, kw};
 use rustc_trait_selection::traits::auto_trait::{self, RegionTarget};

src/librustdoc/clean/mod.rs

@@ -47,7 +47,8 @@ use rustc_hir_analysis::{lower_const_arg_for_rustdoc, lower_ty};
 use rustc_middle::metadata::Reexport;
 use rustc_middle::middle::resolve_bound_vars as rbv;
 use rustc_middle::ty::{
-    self, AdtKind, GenericArgsRef, Ty, TyCtxt, TypeVisitableExt, TypingMode, Unnormalized,
+    self, AdtKind, GenericArgsRef, RegionUtilitiesExt, Ty, TyCtxt, TypeVisitableExt, TypingMode,
+    Unnormalized,
 };
 use rustc_middle::{bug, span_bug};
 use rustc_span::ExpnKind;

src/tools/clippy/clippy_lints/src/eta_reduction.rs

@@ -10,6 +10,7 @@ use rustc_infer::infer::TyCtxtInferExt;
 use rustc_lint::{LateContext, LateLintPass};
 use rustc_middle::ty::adjustment::{Adjust, DerefAdjustKind};
 use rustc_middle::ty::{
+    RegionUtilitiesExt,
     self, Binder, ClosureKind, FnSig, GenericArg, GenericArgKind, List, Region, Ty, TypeVisitableExt, TypeckResults,
 };
 use rustc_session::declare_lint_pass;

src/tools/clippy/clippy_lints/src/operators/identity_op.rs

@@ -7,6 +7,7 @@ use rustc_hir::def::{DefKind, Res};
 use rustc_hir::{BinOpKind, Expr, ExprKind, Node, Path, QPath};
 use rustc_lint::LateContext;
 use rustc_middle::ty;
+use rustc_middle::ty::RegionUtilitiesExt;
 use rustc_span::{Span, SyntaxContext, kw};
 
 use super::IDENTITY_OP;

src/tools/clippy/clippy_lints/src/returns/let_and_return.rs

@@ -8,7 +8,7 @@ use core::ops::ControlFlow;
 use rustc_errors::Applicability;
 use rustc_hir::{Block, Expr, PatKind, StmtKind};
 use rustc_lint::{LateContext, LintContext};
-use rustc_middle::ty::GenericArgKind;
+use rustc_middle::ty::{GenericArgKind, RegionUtilitiesExt};
 use rustc_span::edition::Edition;
 
 use super::LET_AND_RETURN;

src/tools/clippy/clippy_utils/src/lib.rs

@@ -109,6 +109,7 @@ use rustc_middle::mir::{AggregateKind, Operand, RETURN_PLACE, Rvalue, StatementK
 use rustc_middle::ty::adjustment::{Adjust, Adjustment, AutoBorrow, DerefAdjustKind, PointerCoercion};
 use rustc_middle::ty::layout::IntegerExt;
 use rustc_middle::ty::{
+    RegionUtilitiesExt,
     self as rustc_ty, Binder, BorrowKind, ClosureKind, EarlyBinder, GenericArgKind, GenericArgsRef, IntTy, Ty, TyCtxt,
     TypeFlags, TypeVisitableExt, TypeckResults, UintTy, UpvarCapture,
 };

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>>,
 }