From 200bda3daf66f338e9bb1d833146f06fb81f829e Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sun, 8 Dec 2019 12:16:57 +0100
Subject: Cleanup Field ty
---
crates/ra_hir_def/src/resolver.rs | 42 ++++++++++++++++++++++++---------------
1 file changed, 26 insertions(+), 16 deletions(-)
(limited to 'crates/ra_hir_def/src')
diff --git a/crates/ra_hir_def/src/resolver.rs b/crates/ra_hir_def/src/resolver.rs
index 4c859e497..9484a61d5 100644
--- a/crates/ra_hir_def/src/resolver.rs
+++ b/crates/ra_hir_def/src/resolver.rs
@@ -19,7 +19,7 @@ use crate::{
per_ns::PerNs,
AdtId, AstItemDef, ConstId, ContainerId, DefWithBodyId, EnumId, EnumVariantId, FunctionId,
GenericDefId, HasModule, ImplId, LocalModuleId, Lookup, ModuleDefId, ModuleId, StaticId,
- StructId, TraitId, TypeAliasId, TypeParamId,
+ StructId, TraitId, TypeAliasId, TypeParamId, VariantId,
};
#[derive(Debug, Clone, Default)]
@@ -544,16 +544,6 @@ impl HasResolver for FunctionId {
}
}
-impl HasResolver for DefWithBodyId {
- fn resolver(self, db: &impl DefDatabase) -> Resolver {
- match self {
- DefWithBodyId::ConstId(c) => c.resolver(db),
- DefWithBodyId::FunctionId(f) => f.resolver(db),
- DefWithBodyId::StaticId(s) => s.resolver(db),
- }
- }
-}
-
impl HasResolver for ConstId {
fn resolver(self, db: &impl DefDatabase) -> Resolver {
self.lookup(db).container.resolver(db)
@@ -572,6 +562,25 @@ impl HasResolver for TypeAliasId {
}
}
+impl HasResolver for ImplId {
+ fn resolver(self, db: &impl DefDatabase) -> Resolver {
+ self.module(db)
+ .resolver(db)
+ .push_generic_params_scope(db, self.into())
+ .push_impl_block_scope(self)
+ }
+}
+
+impl HasResolver for DefWithBodyId {
+ fn resolver(self, db: &impl DefDatabase) -> Resolver {
+ match self {
+ DefWithBodyId::ConstId(c) => c.resolver(db),
+ DefWithBodyId::FunctionId(f) => f.resolver(db),
+ DefWithBodyId::StaticId(s) => s.resolver(db),
+ }
+ }
+}
+
impl HasResolver for ContainerId {
fn resolver(self, db: &impl DefDatabase) -> Resolver {
match self {
@@ -596,11 +605,12 @@ impl HasResolver for GenericDefId {
}
}
-impl HasResolver for ImplId {
+impl HasResolver for VariantId {
fn resolver(self, db: &impl DefDatabase) -> Resolver {
- self.module(db)
- .resolver(db)
- .push_generic_params_scope(db, self.into())
- .push_impl_block_scope(self)
+ match self {
+ VariantId::EnumVariantId(it) => it.parent.resolver(db),
+ VariantId::StructId(it) => it.resolver(db),
+ VariantId::UnionId(it) => it.resolver(db),
+ }
}
}
--
cgit v1.2.3