squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Intern consts & lifetimes

Browse source 
Slight memory usage reduction.
This commit is contained in:
Florian Diebold 2021-04-08 18:45:07 +02:00
parent 37cb6805af
commit 90656f8674
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
crates/hir_ty/src/chalk_ext.rs
View file

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

25
crates/hir_ty/src/traits/chalk/interner.rs
View file

@ -39,16 +39,29 @@ pub struct InternedSubstitutionInner(SmallVec<[GenericArg; 2]>);
#[derive(PartialEq, Eq, Hash, Debug)]
pub struct InternedTypeInner(chalk_ir::TyData<Interner>);
#[derive(PartialEq, Eq, Hash, Debug)]
pub struct InternedWrapper<T>(T);
impl<T> std::ops::Deref for InternedWrapper<T> {
type Target = T;
fn deref(&self) -> &Self::Target {
&self.0
}
}
impl_internable!(
InternedVariableKindsInner,
InternedSubstitutionInner,
InternedTypeInner,
InternedWrapper<chalk_ir::LifetimeData<Interner>>,
InternedWrapper<chalk_ir::ConstData<Interner>>,
);
impl chalk_ir::interner::Interner for Interner {
type InternedType = Interned<InternedTypeInner>;
type InternedLifetime = chalk_ir::LifetimeData<Self>;
type InternedConst = Arc<chalk_ir::ConstData<Self>>;
type InternedLifetime = Interned<InternedWrapper<chalk_ir::LifetimeData<Self>>>;
type InternedConst = Interned<InternedWrapper<chalk_ir::ConstData<Self>>>;
type InternedConcreteConst = ();
type InternedGenericArg = chalk_ir::GenericArgData<Self>;
type InternedGoal = Arc<GoalData<Self>>;
@ -221,22 +234,22 @@ impl chalk_ir::interner::Interner for Interner {
}
fn intern_lifetime(&self, lifetime: chalk_ir::LifetimeData<Self>) -> Self::InternedLifetime {
lifetime
Interned::new(InternedWrapper(lifetime))
}
fn lifetime_data<'a>(
&self,
lifetime: &'a Self::InternedLifetime,
) -> &'a chalk_ir::LifetimeData<Self> {
lifetime
&lifetime.0
}
fn intern_const(&self, constant: chalk_ir::ConstData<Self>) -> Self::InternedConst {
Arc::new(constant)
Interned::new(InternedWrapper(constant))
}
fn const_data<'a>(&self, constant: &'a Self::InternedConst) -> &'a chalk_ir::ConstData<Self> {
constant
&constant.0
}
fn const_eq(