Skip to content

Commit 36c3731

Browse files
borsbors
committed
Auto merge of #17473 - Veykril:generics, r=Veykril
internal: Tidy up generics handling in hir-ty a bit
2 parents 9b8b6f9 + 873dcf4 commit 36c3731

17 files changed

+401
-403
lines changed

‎src/tools/rust-analyzer/crates/hir-def/src/generics.rs

+20-12
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use hir_expand::{
1111
ExpandResult,
1212
};
1313
use intern::Interned;
14-
use la_arena::Arena;
14+
use la_arena::{Arena, RawIdx};
1515
use once_cell::unsync::Lazy;
1616
use stdx::impl_from;
1717
use syntax::ast::{self, HasGenericParams, HasName, HasTypeBounds};
@@ -28,6 +28,9 @@ use crate::{
2828
LocalLifetimeParamId, LocalTypeOrConstParamId, Lookup, TypeOrConstParamId, TypeParamId,
2929
};
3030

31+
const SELF_PARAM_ID_IN_SELF: la_arena::Idx<TypeOrConstParamData> =
32+
LocalTypeOrConstParamId::from_raw(RawIdx::from_u32(0));
33+
3134
/// Data about a generic type parameter (to a function, struct, impl, ...).
3235
#[derive(Clone, PartialEq, Eq, Debug, Hash)]
3336
pub struct TypeParamData {
@@ -441,22 +444,26 @@ impl GenericParamsCollector {
441444

442445
impl GenericParams {
443446
/// Number of Generic parameters (type_or_consts + lifetimes)
447+
#[inline]
444448
pub fn len(&self) -> usize {
445449
self.type_or_consts.len() + self.lifetimes.len()
446450
}
447451

452+
#[inline]
448453
pub fn is_empty(&self) -> bool {
449454
self.len() == 0
450455
}
451456

452457
/// Iterator of type_or_consts field
458+
#[inline]
453459
pub fn iter_type_or_consts(
454460
&self,
455461
) -> impl DoubleEndedIterator<Item = (LocalTypeOrConstParamId, &TypeOrConstParamData)> {
456462
self.type_or_consts.iter()
457463
}
458464

459465
/// Iterator of lifetimes field
466+
#[inline]
460467
pub fn iter_lt(
461468
&self,
462469
) -> impl DoubleEndedIterator<Item = (LocalLifetimeParamId, &LifetimeParamData)> {
@@ -605,17 +612,18 @@ impl GenericParams {
605612
})
606613
}
607614

608-
pub fn find_trait_self_param(&self) -> Option<LocalTypeOrConstParamId> {
609-
self.type_or_consts.iter().find_map(|(id, p)| {
610-
matches!(
611-
p,
612-
TypeOrConstParamData::TypeParamData(TypeParamData {
613-
provenance: TypeParamProvenance::TraitSelf,
614-
..
615-
})
616-
)
617-
.then(|| id)
618-
})
615+
pub fn trait_self_param(&self) -> Option<LocalTypeOrConstParamId> {
616+
if self.type_or_consts.is_empty() {
617+
return None;
618+
}
619+
matches!(
620+
self.type_or_consts[SELF_PARAM_ID_IN_SELF],
621+
TypeOrConstParamData::TypeParamData(TypeParamData {
622+
provenance: TypeParamProvenance::TraitSelf,
623+
..
624+
})
625+
)
626+
.then(|| SELF_PARAM_ID_IN_SELF)
619627
}
620628

621629
pub fn find_lifetime_by_name(

‎src/tools/rust-analyzer/crates/hir-def/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -923,6 +923,7 @@ pub enum GenericDefId {
923923
ImplId(ImplId),
924924
// enum variants cannot have generics themselves, but their parent enums
925925
// can, and this makes some code easier to write
926+
// FIXME: Try to remove this as that will reduce the amount of query slots generated per enum?
926927
EnumVariantId(EnumVariantId),
927928
// consts can have type parameters from their parents (i.e. associated consts of traits)
928929
ConstId(ConstId),

‎src/tools/rust-analyzer/crates/hir-ty/src/builder.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ use hir_def::{
1414
use smallvec::SmallVec;
1515

1616
use crate::{
17-
consteval::unknown_const_as_generic, db::HirDatabase, error_lifetime,
18-
infer::unify::InferenceTable, primitive, to_assoc_type_id, to_chalk_trait_id, utils::generics,
19-
Binders, BoundVar, CallableSig, GenericArg, GenericArgData, Interner, ProjectionTy,
20-
Substitution, TraitRef, Ty, TyDefId, TyExt, TyKind,
17+
consteval::unknown_const_as_generic, db::HirDatabase, error_lifetime, generics::generics,
18+
infer::unify::InferenceTable, primitive, to_assoc_type_id, to_chalk_trait_id, Binders,
19+
BoundVar, CallableSig, GenericArg, GenericArgData, Interner, ProjectionTy, Substitution,
20+
TraitRef, Ty, TyDefId, TyExt, TyKind,
2121
};
2222

2323
#[derive(Debug, Clone, PartialEq, Eq)]

‎src/tools/rust-analyzer/crates/hir-ty/src/chalk_db.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@ use hir_expand::name::name;
2020
use crate::{
2121
db::{HirDatabase, InternedCoroutine},
2222
display::HirDisplay,
23-
from_assoc_type_id, from_chalk_trait_id, from_foreign_def_id, make_binders,
24-
make_single_type_binders,
23+
from_assoc_type_id, from_chalk_trait_id, from_foreign_def_id,
24+
generics::generics,
25+
make_binders, make_single_type_binders,
2526
mapping::{from_chalk, ToChalk, TypeAliasAsValue},
2627
method_resolution::{TraitImpls, TyFingerprint, ALL_FLOAT_FPS, ALL_INT_FPS},
2728
to_assoc_type_id, to_chalk_trait_id,
2829
traits::ChalkContext,
29-
utils::{generics, ClosureSubst},
30+
utils::ClosureSubst,
3031
wrap_empty_binders, AliasEq, AliasTy, BoundVar, CallableDefId, DebruijnIndex, FnDefId,
3132
Interner, ProjectionTy, ProjectionTyExt, QuantifiedWhereClause, Substitution, TraitRef,
3233
TraitRefExt, Ty, TyBuilder, TyExt, TyKind, WhereClause,

‎src/tools/rust-analyzer/crates/hir-ty/src/chalk_ext.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@ use hir_def::{
1212
};
1313

1414
use crate::{
15-
db::HirDatabase,
16-
from_assoc_type_id, from_chalk_trait_id, from_foreign_def_id, from_placeholder_idx,
17-
to_chalk_trait_id,
18-
utils::{generics, ClosureSubst},
19-
AdtId, AliasEq, AliasTy, Binders, CallableDefId, CallableSig, Canonical, CanonicalVarKinds,
20-
ClosureId, DynTy, FnPointer, ImplTraitId, InEnvironment, Interner, Lifetime, ProjectionTy,
15+
db::HirDatabase, from_assoc_type_id, from_chalk_trait_id, from_foreign_def_id,
16+
from_placeholder_idx, generics::generics, to_chalk_trait_id, utils::ClosureSubst, AdtId,
17+
AliasEq, AliasTy, Binders, CallableDefId, CallableSig, Canonical, CanonicalVarKinds, ClosureId,
18+
DynTy, FnPointer, ImplTraitId, InEnvironment, Interner, Lifetime, ProjectionTy,
2119
QuantifiedWhereClause, Substitution, TraitRef, Ty, TyBuilder, TyKind, TypeFlags, WhereClause,
2220
};
2321

‎src/tools/rust-analyzer/crates/hir-ty/src/consteval.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ use stdx::never;
1515
use triomphe::Arc;
1616

1717
use crate::{
18-
db::HirDatabase, infer::InferenceContext, lower::ParamLoweringMode,
19-
mir::monomorphize_mir_body_bad, to_placeholder_idx, utils::Generics, Const, ConstData,
20-
ConstScalar, ConstValue, GenericArg, Interner, MemoryMap, Substitution, TraitEnvironment, Ty,
21-
TyBuilder,
18+
db::HirDatabase, generics::Generics, infer::InferenceContext, lower::ParamLoweringMode,
19+
mir::monomorphize_mir_body_bad, to_placeholder_idx, Const, ConstData, ConstScalar, ConstValue,
20+
GenericArg, Interner, MemoryMap, Substitution, TraitEnvironment, Ty, TyBuilder,
2221
};
2322

2423
use super::mir::{interpret_mir, lower_to_mir, pad16, MirEvalError, MirLowerError};
@@ -72,12 +71,12 @@ impl From<MirEvalError> for ConstEvalError {
7271
}
7372
}
7473

75-
pub(crate) fn path_to_const(
74+
pub(crate) fn path_to_const<'g>(
7675
db: &dyn HirDatabase,
7776
resolver: &Resolver,
7877
path: &Path,
7978
mode: ParamLoweringMode,
80-
args: impl FnOnce() -> Option<Generics>,
79+
args: impl FnOnce() -> Option<&'g Generics>,
8180
debruijn: DebruijnIndex,
8281
expected_ty: Ty,
8382
) -> Option<Const> {
@@ -90,7 +89,7 @@ pub(crate) fn path_to_const(
9089
}
9190
ParamLoweringMode::Variable => {
9291
let args = args();
93-
match args.as_ref().and_then(|args| args.type_or_const_param_idx(p.into())) {
92+
match args.and_then(|args| args.type_or_const_param_idx(p.into())) {
9493
Some(it) => ConstValue::BoundVar(BoundVar::new(debruijn, it)),
9594
None => {
9695
never!(

‎src/tools/rust-analyzer/crates/hir-ty/src/display.rs

+7-6
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,13 @@ use crate::{
3636
consteval::try_const_usize,
3737
db::{HirDatabase, InternedClosure},
3838
from_assoc_type_id, from_foreign_def_id, from_placeholder_idx,
39+
generics::generics,
3940
layout::Layout,
4041
lt_from_placeholder_idx,
4142
mapping::from_chalk,
4243
mir::pad16,
4344
primitive, to_assoc_type_id,
44-
utils::{self, detect_variant_from_bytes, generics, ClosureSubst},
45+
utils::{self, detect_variant_from_bytes, ClosureSubst},
4546
AdtId, AliasEq, AliasTy, Binders, CallableDefId, CallableSig, ConcreteConst, Const,
4647
ConstScalar, ConstValue, DomainGoal, FnAbi, GenericArg, ImplTraitId, Interner, Lifetime,
4748
LifetimeData, LifetimeOutlives, MemoryMap, Mutability, OpaqueTy, ProjectionTy, ProjectionTyExt,
@@ -493,7 +494,7 @@ impl HirDisplay for Const {
493494
ConstValue::Placeholder(idx) => {
494495
let id = from_placeholder_idx(f.db, *idx);
495496
let generics = generics(f.db.upcast(), id.parent);
496-
let param_data = &generics.params[id.local_id];
497+
let param_data = &generics[id.local_id];
497498
write!(f, "{}", param_data.name().unwrap().display(f.db.upcast()))?;
498499
Ok(())
499500
}
@@ -988,15 +989,15 @@ impl HirDisplay for Ty {
988989

989990
if parameters.len(Interner) > 0 {
990991
let generics = generics(db.upcast(), def.into());
991-
let (parent_len, self_, type_, const_, impl_, lifetime) =
992+
let (parent_len, self_param, type_, const_, impl_, lifetime) =
992993
generics.provenance_split();
993994
let parameters = parameters.as_slice(Interner);
994995
// We print all params except implicit impl Trait params. Still a bit weird; should we leave out parent and self?
995996
if parameters.len() - impl_ > 0 {
996997
// `parameters` are in the order of fn's params (including impl traits), fn's lifetimes
997998
// parent's params (those from enclosing impl or trait, if any).
998999
let (fn_params, other) =
999-
parameters.split_at(self_ + type_ + const_ + lifetime);
1000+
parameters.split_at(self_param as usize + type_ + const_ + lifetime);
10001001
let (_impl, parent_params) = other.split_at(impl_);
10011002
debug_assert_eq!(parent_params.len(), parent_len);
10021003

@@ -1215,7 +1216,7 @@ impl HirDisplay for Ty {
12151216
TyKind::Placeholder(idx) => {
12161217
let id = from_placeholder_idx(db, *idx);
12171218
let generics = generics(db.upcast(), id.parent);
1218-
let param_data = &generics.params[id.local_id];
1219+
let param_data = &generics[id.local_id];
12191220
match param_data {
12201221
TypeOrConstParamData::TypeParamData(p) => match p.provenance {
12211222
TypeParamProvenance::TypeParamList | TypeParamProvenance::TraitSelf => {
@@ -1797,7 +1798,7 @@ impl HirDisplay for LifetimeData {
17971798
LifetimeData::Placeholder(idx) => {
17981799
let id = lt_from_placeholder_idx(f.db, *idx);
17991800
let generics = generics(f.db.upcast(), id.parent);
1800-
let param_data = &generics.params[id.local_id];
1801+
let param_data = &generics[id.local_id];
18011802
write!(f, "{}", param_data.name.display(f.db.upcast()))?;
18021803
Ok(())
18031804
}

0 commit comments

Comments
 (0)