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

Use GenericDefId more

Browse source
This commit is contained in:
Aleksey Kladov 2019-11-25 15:39:12 +03:00
parent 9f7fcc6ecd
commit c2a16632d0
5 changed files with 20 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/ra_hir/src/from_id.rs
View file

@ -9,9 +9,8 @@ use hir_def::{
};
use crate::{
ty::{CallableDef, TypableDef},
Adt, AssocItem, AttrDef, Const, Crate, DefWithBody, EnumVariant, Function, GenericDef,
ModuleDef, Static, StructField, TypeAlias, VariantDef,
ty::TypableDef, Adt, AssocItem, AttrDef, Const, Crate, DefWithBody, EnumVariant, Function,
GenericDef, ModuleDef, Static, StructField, TypeAlias, VariantDef,
};
impl From<ra_db::CrateId> for Crate {
@ -214,18 +213,6 @@ impl From<Adt> for GenericDefId {
}
}
impl From<CallableDef> for GenericDefId {
fn from(def: CallableDef) -> Self {
match def {
CallableDef::Function(it) => it.id.into(),
CallableDef::Struct(it) => it.id.into(),
CallableDef::EnumVariant(it) => {
EnumVariantId { parent: it.parent.id, local_id: it.id }.into()
}
}
}
}
impl From<VariantDef> for VariantId {
fn from(def: VariantDef) -> Self {
match def {