rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

make various enums "inherit" from AdtDef

Browse Source
This commit is contained in:
Aleksey Kladov
2019-09-13 00:10:16 +03:00
parent d8b621cf26
commit 45117c6388
17 changed files with 156 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ra_hir/src/resolve.rs
View File

@@ -15,7 +15,7 @@ use crate::{
name::{Name, SELF_PARAM, SELF_TYPE},
nameres::{CrateDefMap, CrateModuleId, PerNs},
path::Path,
Enum, MacroDef, ModuleDef, Struct, Trait,
AdtDef, Enum, MacroDef, ModuleDef, Struct, Trait,
};
#[derive(Debug, Clone, Default)]
@@ -143,7 +143,7 @@ impl Resolver {
) -> Option<Struct> {
let res = self.resolve_path_segments(db, path).into_fully_resolved().take_types()?;
match res {
Resolution::Def(ModuleDef::Struct(it)) => Some(it),
Resolution::Def(ModuleDef::AdtDef(AdtDef::Struct(it))) => Some(it),
_ => None,
}
}
@@ -152,7 +152,7 @@ impl Resolver {
pub(crate) fn resolve_known_enum(&self, db: &impl HirDatabase, path: &Path) -> Option<Enum> {
let res = self.resolve_path_segments(db, path).into_fully_resolved().take_types()?;
match res {
Resolution::Def(ModuleDef::Enum(it)) => Some(it),
Resolution::Def(ModuleDef::AdtDef(AdtDef::Enum(it))) => Some(it),
_ => None,
}
}