diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index 817a01db115..04875240bc8 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs @@ -1825,7 +1825,7 @@ impl Type { Solution::Unique(s) => s .value .subst - .interned() + .as_slice(&Interner) .first() .map(|ty| self.derived(ty.assert_ty_ref(&Interner).clone())), Solution::Ambig(_) => None, diff --git a/crates/hir_ty/src/chalk_ext.rs b/crates/hir_ty/src/chalk_ext.rs index 28ed3aac6d4..8c454295628 100644 --- a/crates/hir_ty/src/chalk_ext.rs +++ b/crates/hir_ty/src/chalk_ext.rs @@ -75,7 +75,7 @@ impl TyExt for Ty { } fn as_reference(&self) -> Option<(&Ty, Lifetime, Mutability)> { match self.kind(&Interner) { - TyKind::Ref(mutability, lifetime, ty) => Some((ty, *lifetime, *mutability)), + TyKind::Ref(mutability, lifetime, ty) => Some((ty, lifetime.clone(), *mutability)), _ => None, } } diff --git a/crates/hir_ty/src/display.rs b/crates/hir_ty/src/display.rs index d7a3977e53b..92224b46b2c 100644 --- a/crates/hir_ty/src/display.rs +++ b/crates/hir_ty/src/display.rs @@ -265,7 +265,7 @@ impl HirDisplay for ProjectionTy { write!(f, " as {}", trait_.name)?; if self.substitution.len(&Interner) > 1 { write!(f, "<")?; - f.write_joined(&self.substitution.interned()[1..], ", ")?; + f.write_joined(&self.substitution.as_slice(&Interner)[1..], ", ")?; write!(f, ">")?; } write!(f, ">::{}", f.db.type_alias_data(from_assoc_type_id(self.associated_ty_id)).name)?; @@ -416,7 +416,7 @@ impl HirDisplay for Ty { write!(f, ",)")?; } else { write!(f, "(")?; - f.write_joined(&*substs.interned(), ", ")?; + f.write_joined(&*substs.as_slice(&Interner), ", ")?; write!(f, ")")?; } } @@ -444,7 +444,7 @@ impl HirDisplay for Ty { // We print all params except implicit impl Trait params. Still a bit weird; should we leave out parent and self? if total_len > 0 { write!(f, "<")?; - f.write_joined(¶meters.interned()[..total_len], ", ")?; + f.write_joined(¶meters.as_slice(&Interner)[..total_len], ", ")?; write!(f, ">")?; } } @@ -491,7 +491,7 @@ impl HirDisplay for Ty { .map(|generic_def_id| f.db.generic_defaults(generic_def_id)) .filter(|defaults| !defaults.is_empty()) { - None => parameters.interned().as_ref(), + None => parameters.as_slice(&Interner), Some(default_parameters) => { let mut default_from = 0; for (i, parameter) in parameters.iter(&Interner).enumerate() { @@ -515,11 +515,11 @@ impl HirDisplay for Ty { } } } - ¶meters.interned()[0..default_from] + ¶meters.as_slice(&Interner)[0..default_from] } } } else { - parameters.interned().as_ref() + parameters.as_slice(&Interner) }; if !parameters_to_write.is_empty() { write!(f, "<")?; @@ -542,7 +542,7 @@ impl HirDisplay for Ty { write!(f, "{}::{}", trait_.name, type_alias_data.name)?; if parameters.len(&Interner) > 0 { write!(f, "<")?; - f.write_joined(&*parameters.interned(), ", ")?; + f.write_joined(&*parameters.as_slice(&Interner), ", ")?; write!(f, ">")?; } } else { @@ -749,13 +749,13 @@ fn write_bounds_like_dyn_trait( // existential) here, which is the only thing that's // possible in actual Rust, and hence don't print it write!(f, "{}", f.db.trait_data(trait_).name)?; - if let [_, params @ ..] = &*trait_ref.substitution.interned().as_slice() { + if let [_, params @ ..] = &*trait_ref.substitution.as_slice(&Interner) { if is_fn_trait { if let Some(args) = params.first().and_then(|it| it.assert_ty_ref(&Interner).as_tuple()) { write!(f, "(")?; - f.write_joined(&*args.interned(), ", ")?; + f.write_joined(args.as_slice(&Interner), ", ")?; write!(f, ")")?; } } else if !params.is_empty() { @@ -814,7 +814,7 @@ fn fmt_trait_ref(tr: &TraitRef, f: &mut HirFormatter, use_as: bool) -> Result<() write!(f, "{}", f.db.trait_data(tr.hir_trait_id()).name)?; if tr.substitution.len(&Interner) > 1 { write!(f, "<")?; - f.write_joined(&tr.substitution.interned()[1..], ", ")?; + f.write_joined(&tr.substitution.as_slice(&Interner)[1..], ", ")?; write!(f, ">")?; } Ok(()) diff --git a/crates/hir_ty/src/infer/expr.rs b/crates/hir_ty/src/infer/expr.rs index cbbfa8b5c3a..7961f4a5299 100644 --- a/crates/hir_ty/src/infer/expr.rs +++ b/crates/hir_ty/src/infer/expr.rs @@ -462,7 +462,11 @@ impl<'a> InferenceContext<'a> { }; match canonicalized.decanonicalize_ty(derefed_ty.value).kind(&Interner) { TyKind::Tuple(_, substs) => name.as_tuple_index().and_then(|idx| { - substs.interned().get(idx).map(|a| a.assert_ty_ref(&Interner)).cloned() + substs + .as_slice(&Interner) + .get(idx) + .map(|a| a.assert_ty_ref(&Interner)) + .cloned() }), TyKind::Adt(AdtId(hir_def::AdtId::StructId(s)), parameters) => { let local_id = self.db.struct_data(*s).variant_data.field(name)?; diff --git a/crates/hir_ty/src/infer/pat.rs b/crates/hir_ty/src/infer/pat.rs index a41e8e11669..aea354cdecf 100644 --- a/crates/hir_ty/src/infer/pat.rs +++ b/crates/hir_ty/src/infer/pat.rs @@ -122,7 +122,7 @@ impl<'a> InferenceContext<'a> { let ty = match &body[pat] { &Pat::Tuple { ref args, ellipsis } => { let expectations = match expected.as_tuple() { - Some(parameters) => &*parameters.interned().as_slice(), + Some(parameters) => &*parameters.as_slice(&Interner), _ => &[], }; @@ -242,7 +242,7 @@ impl<'a> InferenceContext<'a> { let (inner_ty, alloc_ty) = match expected.as_adt() { Some((adt, subst)) if adt == box_adt => ( subst.at(&Interner, 0).assert_ty_ref(&Interner).clone(), - subst.interned().get(1).and_then(|a| a.ty(&Interner).cloned()), + subst.as_slice(&Interner).get(1).and_then(|a| a.ty(&Interner).cloned()), ), _ => (self.result.standard_types.unknown.clone(), None), }; diff --git a/crates/hir_ty/src/infer/path.rs b/crates/hir_ty/src/infer/path.rs index f8955aa3249..495282eba85 100644 --- a/crates/hir_ty/src/infer/path.rs +++ b/crates/hir_ty/src/infer/path.rs @@ -101,7 +101,7 @@ impl<'a> InferenceContext<'a> { let substs = ctx.substs_from_path(path, typable, true); let ty = TyBuilder::value_ty(self.db, typable) .use_parent_substs(&parent_substs) - .fill(substs.interned()[parent_substs.len(&Interner)..].iter().cloned()) + .fill(substs.as_slice(&Interner)[parent_substs.len(&Interner)..].iter().cloned()) .build(); Some(ty) } diff --git a/crates/hir_ty/src/lib.rs b/crates/hir_ty/src/lib.rs index 874c9541139..beb58d71173 100644 --- a/crates/hir_ty/src/lib.rs +++ b/crates/hir_ty/src/lib.rs @@ -109,7 +109,7 @@ pub type WhereClause = chalk_ir::WhereClause; pub fn subst_prefix(s: &Substitution, n: usize) -> Substitution { Substitution::from_iter( &Interner, - s.interned()[..std::cmp::min(s.len(&Interner), n)].iter().cloned(), + s.as_slice(&Interner)[..std::cmp::min(s.len(&Interner), n)].iter().cloned(), ) } @@ -187,7 +187,7 @@ impl CallableSig { .shifted_out_to(&Interner, DebruijnIndex::ONE) .expect("unexpected lifetime vars in fn ptr") .0 - .interned() + .as_slice(&Interner) .iter() .map(|arg| arg.assert_ty_ref(&Interner).clone()) .collect(), diff --git a/crates/hir_ty/src/traits/chalk/interner.rs b/crates/hir_ty/src/traits/chalk/interner.rs index bd9395b7ed1..b6a3cec6d56 100644 --- a/crates/hir_ty/src/traits/chalk/interner.rs +++ b/crates/hir_ty/src/traits/chalk/interner.rs @@ -2,9 +2,13 @@ //! representation of the various objects Chalk deals with (types, goals etc.). use super::tls; +use crate::GenericArg; use base_db::salsa::InternId; -use chalk_ir::{GenericArg, Goal, GoalData}; -use hir_def::TypeAliasId; +use chalk_ir::{Goal, GoalData}; +use hir_def::{ + intern::{impl_internable, InternStorage, Internable, Interned}, + TypeAliasId, +}; use smallvec::SmallVec; use std::{fmt, sync::Arc}; @@ -26,22 +30,47 @@ pub(crate) type OpaqueTyId = chalk_ir::OpaqueTyId; pub(crate) type OpaqueTyDatum = chalk_solve::rust_ir::OpaqueTyDatum; pub(crate) type Variances = chalk_ir::Variances; +#[derive(PartialEq, Eq, Hash, Debug)] +pub struct InternedWrapper(T); + +impl std::ops::Deref for InternedWrapper { + type Target = T; + + fn deref(&self) -> &Self::Target { + &self.0 + } +} + +impl_internable!( + InternedWrapper>>, + InternedWrapper>, + InternedWrapper>, + InternedWrapper>, + InternedWrapper>, + InternedWrapper>>, + InternedWrapper>>, + InternedWrapper>>, + InternedWrapper>, +); + impl chalk_ir::interner::Interner for Interner { - type InternedType = Arc>; - type InternedLifetime = chalk_ir::LifetimeData; - type InternedConst = Arc>; + type InternedType = Interned>>; + type InternedLifetime = Interned>>; + type InternedConst = Interned>>; type InternedConcreteConst = (); type InternedGenericArg = chalk_ir::GenericArgData; type InternedGoal = Arc>; type InternedGoals = Vec>; - type InternedSubstitution = SmallVec<[GenericArg; 2]>; - type InternedProgramClause = Arc>; - type InternedProgramClauses = Arc<[chalk_ir::ProgramClause]>; - type InternedQuantifiedWhereClauses = Vec>; - type InternedVariableKinds = Vec>; - type InternedCanonicalVarKinds = Vec>; + type InternedSubstitution = Interned>>; + type InternedProgramClause = chalk_ir::ProgramClauseData; + type InternedProgramClauses = Interned>>>; + type InternedQuantifiedWhereClauses = + Interned>>>; + type InternedVariableKinds = Interned>>>; + type InternedCanonicalVarKinds = + Interned>>>; type InternedConstraints = Vec>>; - type InternedVariances = Arc<[chalk_ir::Variance]>; + type InternedVariances = Interned>>; type DefId = InternId; type InternedAdtId = hir_def::AdtId; type Identifier = TypeAliasId; @@ -99,7 +128,7 @@ impl chalk_ir::interner::Interner for Interner { } fn debug_generic_arg( - parameter: &GenericArg, + parameter: &GenericArg, fmt: &mut fmt::Formatter<'_>, ) -> Option { tls::with_current_program(|prog| Some(prog?.debug_generic_arg(parameter, fmt))) @@ -194,30 +223,30 @@ impl chalk_ir::interner::Interner for Interner { fn intern_ty(&self, kind: chalk_ir::TyKind) -> Self::InternedType { let flags = kind.compute_flags(self); - Arc::new(chalk_ir::TyData { kind, flags }) + Interned::new(InternedWrapper(chalk_ir::TyData { kind, flags })) } fn ty_data<'a>(&self, ty: &'a Self::InternedType) -> &'a chalk_ir::TyData { - ty + &ty.0 } fn intern_lifetime(&self, lifetime: chalk_ir::LifetimeData) -> Self::InternedLifetime { - lifetime + Interned::new(InternedWrapper(lifetime)) } fn lifetime_data<'a>( &self, lifetime: &'a Self::InternedLifetime, ) -> &'a chalk_ir::LifetimeData { - lifetime + &lifetime.0 } fn intern_const(&self, constant: chalk_ir::ConstData) -> Self::InternedConst { - Arc::new(constant) + Interned::new(InternedWrapper(constant)) } fn const_data<'a>(&self, constant: &'a Self::InternedConst) -> &'a chalk_ir::ConstData { - constant + &constant.0 } fn const_eq( @@ -264,23 +293,23 @@ impl chalk_ir::interner::Interner for Interner { fn intern_substitution( &self, - data: impl IntoIterator, E>>, + data: impl IntoIterator>, ) -> Result { - data.into_iter().collect() + Ok(Interned::new(InternedWrapper(data.into_iter().collect::>()?))) } fn substitution_data<'a>( &self, substitution: &'a Self::InternedSubstitution, - ) -> &'a [GenericArg] { - substitution + ) -> &'a [GenericArg] { + &substitution.as_ref().0 } fn intern_program_clause( &self, data: chalk_ir::ProgramClauseData, ) -> Self::InternedProgramClause { - Arc::new(data) + data } fn program_clause_data<'a>( @@ -294,7 +323,7 @@ impl chalk_ir::interner::Interner for Interner { &self, data: impl IntoIterator, E>>, ) -> Result { - data.into_iter().collect() + Ok(Interned::new(InternedWrapper(data.into_iter().collect::>()?))) } fn program_clauses_data<'a>( @@ -308,7 +337,7 @@ impl chalk_ir::interner::Interner for Interner { &self, data: impl IntoIterator, E>>, ) -> Result { - data.into_iter().collect() + Ok(Interned::new(InternedWrapper(data.into_iter().collect::>()?))) } fn quantified_where_clauses_data<'a>( @@ -322,21 +351,21 @@ impl chalk_ir::interner::Interner for Interner { &self, data: impl IntoIterator, E>>, ) -> Result { - data.into_iter().collect() + Ok(Interned::new(InternedWrapper(data.into_iter().collect::>()?))) } fn variable_kinds_data<'a>( &self, parameter_kinds: &'a Self::InternedVariableKinds, ) -> &'a [chalk_ir::VariableKind] { - ¶meter_kinds + ¶meter_kinds.as_ref().0 } fn intern_canonical_var_kinds( &self, data: impl IntoIterator, E>>, ) -> Result { - data.into_iter().collect() + Ok(Interned::new(InternedWrapper(data.into_iter().collect::>()?))) } fn canonical_var_kinds_data<'a>( @@ -376,7 +405,7 @@ impl chalk_ir::interner::Interner for Interner { &self, data: impl IntoIterator>, ) -> Result { - data.into_iter().collect() + Ok(Interned::new(InternedWrapper(data.into_iter().collect::>()?))) } fn variances_data<'a>( diff --git a/crates/hir_ty/src/traits/chalk/mapping.rs b/crates/hir_ty/src/traits/chalk/mapping.rs index 7818f6387eb..e78581ea5b4 100644 --- a/crates/hir_ty/src/traits/chalk/mapping.rs +++ b/crates/hir_ty/src/traits/chalk/mapping.rs @@ -99,7 +99,7 @@ pub(super) fn generic_predicate_to_inline_bound( // have the expected self type return None; } - let args_no_self = trait_ref.substitution.interned()[1..] + let args_no_self = trait_ref.substitution.as_slice(&Interner)[1..] .iter() .map(|ty| ty.clone().cast(&Interner)) .collect(); @@ -111,7 +111,7 @@ pub(super) fn generic_predicate_to_inline_bound( return None; } let trait_ = projection_ty.trait_(db); - let args_no_self = projection_ty.substitution.interned()[1..] + let args_no_self = projection_ty.substitution.as_slice(&Interner)[1..] .iter() .map(|ty| ty.clone().cast(&Interner)) .collect();