From 45117c63884366ee82102a782a62a09fefff746b Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 13 Sep 2019 00:10:16 +0300 Subject: make various enums "inherit" from AdtDef --- crates/ra_hir/src/resolve.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crates/ra_hir/src/resolve.rs') diff --git a/crates/ra_hir/src/resolve.rs b/crates/ra_hir/src/resolve.rs index 1ed150f5a..251945112 100644 --- a/crates/ra_hir/src/resolve.rs +++ b/crates/ra_hir/src/resolve.rs @@ -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 { 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 { 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, } } -- cgit v1.2.3