language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-30 13:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add Container enum to handle both kinds of container (impl/trait)

Browse source
This commit is contained in:
Florian Diebold 2019-04-14 11:15:11 +02:00
parent 7650a44640
commit 4497e1d3ea
4 changed files with 58 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/ra_hir/src/generics.rs
View file

@ -9,7 +9,7 @@ use ra_syntax::ast::{self, NameOwner, TypeParamsOwner};
use crate::{
db::DefDatabase,
Name, AsName, Function, Struct, Enum, Trait, TypeAlias, ImplBlock
Name, AsName, Function, Struct, Enum, Trait, TypeAlias, ImplBlock, Container
};
/// Data about a generic parameter (to a function, struct, impl, ...).
@ -27,6 +27,7 @@ pub struct GenericParams {
pub(crate) params: Vec<GenericParam>,
}
// FIXME: consts can have type parameters from their parents (i.e. associated consts of traits)
#[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
pub enum GenericDef {
Function(Function),
@ -45,12 +46,8 @@ impl GenericParams {
) -> Arc<GenericParams> {
let mut generics = GenericParams::default();
let parent = match def {
// FIXME abstract over containers (trait/impl)
GenericDef::Function(it) => it
.impl_block(db)
.map(GenericDef::from)
.or_else(|| it.parent_trait(db).map(GenericDef::from)),
GenericDef::TypeAlias(it) => it.impl_block(db).map(GenericDef::from),
GenericDef::Function(it) => it.container(db).map(GenericDef::from),
GenericDef::TypeAlias(it) => it.container(db).map(GenericDef::from),
GenericDef::Struct(_) | GenericDef::Enum(_) | GenericDef::Trait(_) => None,
GenericDef::ImplBlock(_) => None,
};
@ -112,3 +109,12 @@ impl GenericParams {
vec
}
}
impl From<Container> for GenericDef {
fn from(c: Container) -> Self {
match c {
Container::Trait(trait_) => trait_.into(),
Container::ImplBlock(impl_block) => impl_block.into(),
}
}
}