language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 14:21:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Intern VariableKinds

Browse source
This commit is contained in:
Florian Diebold 2021-04-08 18:13:02 +02:00
parent 63726a91b7
commit a169fa6a83
1 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,10 @@
use super::tls; use super::tls;
use base_db::salsa::InternId; use base_db::salsa::InternId;
use chalk_ir::{GenericArg, Goal, GoalData}; use chalk_ir::{GenericArg, Goal, GoalData};
use hir_def::TypeAliasId; use hir_def::{
intern::{impl_internable, InternStorage, Internable, Interned},
TypeAliasId,
};
use smallvec::SmallVec; use smallvec::SmallVec;
use std::{fmt, sync::Arc}; use std::{fmt, sync::Arc};
@ -26,6 +29,11 @@ pub(crate) type OpaqueTyId = chalk_ir::OpaqueTyId<Interner>;
pub(crate) type OpaqueTyDatum = chalk_solve::rust_ir::OpaqueTyDatum<Interner>; pub(crate) type OpaqueTyDatum = chalk_solve::rust_ir::OpaqueTyDatum<Interner>;
pub(crate) type Variances = chalk_ir::Variances<Interner>; pub(crate) type Variances = chalk_ir::Variances<Interner>;
#[derive(PartialEq, Eq, Hash, Debug)]
pub struct InternedVariableKindsInner(Vec<chalk_ir::VariableKind<Interner>>);
impl_internable!(InternedVariableKindsInner,);
impl chalk_ir::interner::Interner for Interner { impl chalk_ir::interner::Interner for Interner {
type InternedType = Arc<chalk_ir::TyData<Self>>; type InternedType = Arc<chalk_ir::TyData<Self>>;
type InternedLifetime = chalk_ir::LifetimeData<Self>; type InternedLifetime = chalk_ir::LifetimeData<Self>;
@ -38,7 +46,7 @@ impl chalk_ir::interner::Interner for Interner {
type InternedProgramClause = Arc<chalk_ir::ProgramClauseData<Self>>; type InternedProgramClause = Arc<chalk_ir::ProgramClauseData<Self>>;
type InternedProgramClauses = Arc<[chalk_ir::ProgramClause<Self>]>; type InternedProgramClauses = Arc<[chalk_ir::ProgramClause<Self>]>;
type InternedQuantifiedWhereClauses = Vec<chalk_ir::QuantifiedWhereClause<Self>>; type InternedQuantifiedWhereClauses = Vec<chalk_ir::QuantifiedWhereClause<Self>>;
type InternedVariableKinds = Vec<chalk_ir::VariableKind<Self>>; type InternedVariableKinds = Interned<InternedVariableKindsInner>;
type InternedCanonicalVarKinds = Vec<chalk_ir::CanonicalVarKind<Self>>; type InternedCanonicalVarKinds = Vec<chalk_ir::CanonicalVarKind<Self>>;
type InternedConstraints = Vec<chalk_ir::InEnvironment<chalk_ir::Constraint<Self>>>; type InternedConstraints = Vec<chalk_ir::InEnvironment<chalk_ir::Constraint<Self>>>;
type InternedVariances = Arc<[chalk_ir::Variance]>; type InternedVariances = Arc<[chalk_ir::Variance]>;
@ -322,14 +330,16 @@ impl chalk_ir::interner::Interner for Interner {
&self, &self,
data: impl IntoIterator<Item = Result<chalk_ir::VariableKind<Self>, E>>, data: impl IntoIterator<Item = Result<chalk_ir::VariableKind<Self>, E>>,
) -> Result<Self::InternedVariableKinds, E> { ) -> Result<Self::InternedVariableKinds, E> {
data.into_iter().collect() Ok(Interned::new(InternedVariableKindsInner(
data.into_iter().collect::<Result<Vec<_>, E>>()?,
)))
} }
fn variable_kinds_data<'a>( fn variable_kinds_data<'a>(
&self, &self,
parameter_kinds: &'a Self::InternedVariableKinds, parameter_kinds: &'a Self::InternedVariableKinds,
) -> &'a [chalk_ir::VariableKind<Self>] { ) -> &'a [chalk_ir::VariableKind<Self>] {
&parameter_kinds &parameter_kinds.as_ref().0
} }
fn intern_canonical_var_kinds<E>( fn intern_canonical_var_kinds<E>(