language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Wrap BuiltinType in code model

Browse source
This commit is contained in:
Jonas Schievink 2021-02-11 19:52:33 +01:00
parent b0f20a795d
commit 216dc856c5
9 changed files with 56 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/hir/src/from_id.rs
View file

@ -11,8 +11,9 @@ use hir_def::{
};
use crate::{
code_model::GenericParam, Adt, AssocItem, DefWithBody, Field, GenericDef, Label, Local,
MacroDef, ModuleDef, Variant, VariantDef,
code_model::{BuiltinType, GenericParam},
Adt, AssocItem, DefWithBody, Field, GenericDef, Label, Local, MacroDef, ModuleDef, Variant,
VariantDef,
};
macro_rules! from_id {
@ -111,7 +112,7 @@ impl From<ModuleDefId> for ModuleDef {
ModuleDefId::StaticId(it) => ModuleDef::Static(it.into()),
ModuleDefId::TraitId(it) => ModuleDef::Trait(it.into()),
ModuleDefId::TypeAliasId(it) => ModuleDef::TypeAlias(it.into()),
ModuleDefId::BuiltinType(it) => ModuleDef::BuiltinType(it),
ModuleDefId::BuiltinType(it) => ModuleDef::BuiltinType(it.into()),
}
}
}
@ -127,7 +128,7 @@ impl From<ModuleDef> for ModuleDefId {
ModuleDef::Static(it) => ModuleDefId::StaticId(it.into()),
ModuleDef::Trait(it) => ModuleDefId::TraitId(it.into()),
ModuleDef::TypeAlias(it) => ModuleDefId::TypeAliasId(it.into()),
ModuleDef::BuiltinType(it) => ModuleDefId::BuiltinType(it),
ModuleDef::BuiltinType(it) => ModuleDefId::BuiltinType(it.into()),
}
}
}
@ -274,3 +275,15 @@ impl From<ModuleDef> for ItemInNs {
}
}
}
impl From<hir_def::builtin_type::BuiltinType> for BuiltinType {
fn from(inner: hir_def::builtin_type::BuiltinType) -> Self {
Self { inner }
}
}
impl From<BuiltinType> for hir_def::builtin_type::BuiltinType {
fn from(it: BuiltinType) -> Self {
it.inner
}
}