Move generic_params query to HIR

1 files changed, 2 insertions, 17 deletions

diff --git a/crates/ra_hir/src/generics.rs b/crates/ra_hir/src/generics.rs
index caedb90e6..54ed03642 100644
--- a/crates/ra_hir/src/generics.rs
+++ b/crates/ra_hir/src/generics.rs
@@ -2,7 +2,7 @@
 use std::sync::Arc;
 
 use crate::{
-    db::{AstDatabase, DefDatabase, HirDatabase},
+    db::{DefDatabase, HirDatabase},
     Adt, Const, Container, Enum, EnumVariant, Function, ImplBlock, Struct, Trait, TypeAlias, Union,
 };
 
@@ -31,21 +31,6 @@ impl_froms!(
     Const
 );
 
-pub(crate) fn generic_params_query(
-    db: &(impl DefDatabase + AstDatabase),
-    def: GenericDef,
-) -> Arc<GenericParams> {
-    let parent = match def {
-        GenericDef::Function(it) => it.container(db).map(GenericDef::from),
-        GenericDef::TypeAlias(it) => it.container(db).map(GenericDef::from),
-        GenericDef::Const(it) => it.container(db).map(GenericDef::from),
-        GenericDef::EnumVariant(it) => Some(it.parent_enum(db).into()),
-        GenericDef::Adt(_) | GenericDef::Trait(_) => None,
-        GenericDef::ImplBlock(_) => None,
-    };
-    Arc::new(GenericParams::new(db, def.into(), parent.map(|it| db.generic_params(it))))
-}
-
 impl GenericDef {
     pub(crate) fn resolver(&self, db: &impl HirDatabase) -> crate::Resolver {
         match self {
@@ -78,6 +63,6 @@ where
     T: Into<GenericDef> + Copy,
 {
     fn generic_params(self, db: &impl DefDatabase) -> Arc<GenericParams> {
-        db.generic_params(self.into())
+        db.generic_params(self.into().into())
     }
 }