Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir_def/src/resolver.rs')
| -rw-r--r-- | crates/hir_def/src/resolver.rs | 45 |
1 files changed, 29 insertions, 16 deletions
diff --git a/crates/hir_def/src/resolver.rs b/crates/hir_def/src/resolver.rs index 9f68b800a5..e19e8543b4 100644 --- a/crates/hir_def/src/resolver.rs +++ b/crates/hir_def/src/resolver.rs @@ -15,7 +15,7 @@ use crate::{ builtin_type::BuiltinType, db::DefDatabase, expr::{ExprId, LabelId, PatId}, - generics::GenericParams, + generics::{GenericParams, TypeOrConstParamData}, intern::Interned, item_scope::{BuiltinShadowMode, BUILTIN_SCOPE}, nameres::DefMap, @@ -25,7 +25,7 @@ use crate::{ AdtId, AssocItemId, ConstId, ConstParamId, DefWithBodyId, EnumId, EnumVariantId, ExternBlockId, FunctionId, GenericDefId, GenericParamId, HasModule, ImplId, ItemContainerId, LifetimeParamId, LocalModuleId, Lookup, ModuleDefId, ModuleId, StaticId, StructId, TraitId, TypeAliasId, - TypeParamId, VariantId, + TypeOrConstParamId, VariantId, }; #[derive(Debug, Clone, Default)] @@ -68,7 +68,7 @@ enum Scope { #[derive(Debug, Clone, PartialEq, Eq, Hash)] pub enum TypeNs { SelfType(ImplId), - GenericParam(TypeParamId), + GenericParam(TypeOrConstParamId), AdtId(AdtId), AdtSelfType(AdtId), // Yup, enum variants are added to the types ns, but any usage of variant as @@ -192,10 +192,12 @@ impl Resolver { Scope::GenericParams { .. } | Scope::ImplDefScope(_) if skip_to_mod => continue, Scope::GenericParams { params, def } => { - if let Some(local_id) = params.find_type_by_name(first_name) { + if let Some(local_id) = params.find_type_or_const_by_name(first_name) { let idx = if path.segments().len() == 1 { None } else { Some(1) }; return Some(( - TypeNs::GenericParam(TypeParamId { local_id, parent: *def }), + TypeNs::GenericParam( + TypeOrConstParamId { local_id, parent: *def }.into(), + ), idx, )); } @@ -285,14 +287,18 @@ impl Resolver { Scope::ExprScope(_) => continue, Scope::GenericParams { params, def } if n_segments > 1 => { - if let Some(local_id) = params.find_type_by_name(first_name) { - let ty = TypeNs::GenericParam(TypeParamId { local_id, parent: *def }); + if let Some(local_id) = params.find_type_or_const_by_name(first_name) { + let ty = TypeNs::GenericParam( + TypeOrConstParamId { local_id, parent: *def }.into(), + ); return Some(ResolveValueResult::Partial(ty, 1)); } } Scope::GenericParams { params, def } if n_segments == 1 => { - if let Some(local_id) = params.find_const_by_name(first_name) { - let val = ValueNs::GenericParam(ConstParamId { local_id, parent: *def }); + if let Some(local_id) = params.find_type_or_const_by_name(first_name) { + let val = ValueNs::GenericParam( + TypeOrConstParamId { local_id, parent: *def }.into(), + ); return Some(ResolveValueResult::ValueNs(val)); } } @@ -521,15 +527,22 @@ impl Scope { Scope::GenericParams { params, def: parent } => { let parent = *parent; for (local_id, param) in params.types.iter() { - if let Some(name) = ¶m.name { - let id = TypeParamId { parent, local_id }; - acc.add(name, ScopeDef::GenericParam(id.into())) + if let Some(name) = ¶m.name() { + let id = TypeOrConstParamId { parent, local_id }; + let data = &db.generic_params(parent).types[local_id]; + acc.add( + name, + ScopeDef::GenericParam(match data { + TypeOrConstParamData::TypeParamData(_) => { + GenericParamId::TypeParamId(id.into()) + } + TypeOrConstParamData::ConstParamData(_) => { + GenericParamId::ConstParamId(id.into()) + } + }), + ); } } - for (local_id, param) in params.consts.iter() { - let id = ConstParamId { parent, local_id }; - acc.add(¶m.name, ScopeDef::GenericParam(id.into())) - } for (local_id, param) in params.lifetimes.iter() { let id = LifetimeParamId { parent, local_id }; acc.add(¶m.name, ScopeDef::GenericParam(id.into())) |