language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-27 10:17:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Make GenericParamsCollector::type_or_consts not unnecessarily pub(crate)

Browse source
This commit is contained in:
¨Florian 2025-02-23 18:40:31 +01:00 • committed by Florian Diebold
parent 44f18c3d05
commit 9780734028
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/hir-def/src/generics.rs
View file

@ -10,6 +10,7 @@ use hir_expand::{
name::{AsName, Name},
ExpandResult,
};
use intern::sym;
use la_arena::{Arena, RawIdx};
use stdx::{
impl_from,
@ -446,12 +447,23 @@ impl GenericParams {
#[derive(Clone, Default)]
pub(crate) struct GenericParamsCollector {
pub(crate) type_or_consts: Arena<TypeOrConstParamData>,
type_or_consts: Arena<TypeOrConstParamData>,
lifetimes: Arena<LifetimeParamData>,
where_predicates: Vec<WherePredicate>,
}
impl GenericParamsCollector {
pub(crate) fn fill_self_param(&mut self) {
self.type_or_consts.alloc(
TypeParamData {
name: Some(Name::new_symbol_root(sym::Self_.clone())),
default: None,
provenance: TypeParamProvenance::TraitSelf,
}
.into(),
);
}
pub(crate) fn fill(
&mut self,
lower_ctx: &mut LowerCtx<'_>,

11
crates/hir-def/src/item_tree/lower.rs
View file

@ -21,7 +21,7 @@ use triomphe::Arc;
use crate::{
db::DefDatabase,
generics::{GenericParams, GenericParamsCollector, TypeParamData, TypeParamProvenance},
generics::{GenericParams, GenericParamsCollector},
item_tree::{
AssocItem, AttrOwner, Const, Either, Enum, ExternBlock, ExternCrate, Field, FieldParent,
FieldsShape, FileItemTreeId, FnFlags, Function, GenericArgs, GenericItemSourceMapBuilder,
@ -881,14 +881,7 @@ impl<'a> Ctx<'a> {
if let HasImplicitSelf::Yes(bounds) = has_implicit_self {
// Traits and trait aliases get the Self type as an implicit first type parameter.
generics.type_or_consts.alloc(
TypeParamData {
name: Some(Name::new_symbol_root(sym::Self_.clone())),
default: None,
provenance: TypeParamProvenance::TraitSelf,
}
.into(),
);
generics.fill_self_param();
// add super traits as bounds on Self
// i.e., `trait Foo: Bar` is equivalent to `trait Foo where Self: Bar`
let bound_target = Either::Left(body_ctx.alloc_type_ref_desugared(TypeRef::Path(