language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 05:15:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Don't duplicate ContainerId type

Browse source
This commit is contained in:
Aleksey Kladov 2019-11-20 17:49:57 +03:00
parent 64c21ed195
commit ee95a35664
5 changed files with 35 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/ra_hir/src/code_model.rs
View file

@ -12,8 +12,8 @@ use hir_def::{
builtin_type::BuiltinType,
traits::TraitData,
type_ref::{Mutability, TypeRef},
AssocItemId, CrateModuleId, FunctionContainerId, HasModule, ImplId, LocalEnumVariantId,
LocalStructFieldId, Lookup, ModuleId, TypeAliasContainerId, UnionId,
AssocItemId, ContainerId, CrateModuleId, HasModule, ImplId, LocalEnumVariantId,
LocalStructFieldId, Lookup, ModuleId, UnionId,
};
use hir_expand::{
diagnostics::DiagnosticSink,
@ -697,9 +697,9 @@ impl Function {
pub fn container(self, db: &impl DefDatabase) -> Option<Container> {
match self.id.lookup(db).container {
FunctionContainerId::TraitId(it) => Some(Container::Trait(it.into())),
FunctionContainerId::ImplId(it) => Some(Container::ImplBlock(it.into())),
FunctionContainerId::ModuleId(_) => None,
ContainerId::TraitId(it) => Some(Container::Trait(it.into())),
ContainerId::ImplId(it) => Some(Container::ImplBlock(it.into())),
ContainerId::ModuleId(_) => None,
}
}
@ -979,9 +979,9 @@ impl TypeAlias {
pub fn container(self, db: &impl DefDatabase) -> Option<Container> {
match self.id.lookup(db).container {
TypeAliasContainerId::TraitId(it) => Some(Container::Trait(it.into())),
TypeAliasContainerId::ImplId(it) => Some(Container::ImplBlock(it.into())),
TypeAliasContainerId::ModuleId(_) => None,
ContainerId::TraitId(it) => Some(Container::Trait(it.into())),
ContainerId::ImplId(it) => Some(Container::ImplBlock(it.into())),
ContainerId::ModuleId(_) => None,
}
}