use std::sync::Arc;

use ra_syntax::ast::{self, NameOwner};

use crate::{
    Name, AsName, Const, ConstSignature, Static,
    type_ref::{TypeRef},
    PersistentHirDatabase,
};

fn const_signature_for<N: NameOwner>(
    node: &N,
    type_ref: Option<&ast::TypeRef>,
) -> Arc<ConstSignature> {
    let name = node.name().map(|n| n.as_name()).unwrap_or_else(Name::missing);
    let type_ref = TypeRef::from_ast_opt(type_ref);
    let sig = ConstSignature { name, type_ref };
    Arc::new(sig)
}

impl ConstSignature {
    pub(crate) fn const_signature_query(
        db: &impl PersistentHirDatabase,
        konst: Const,
    ) -> Arc<ConstSignature> {
        let (_, node) = konst.source(db);
        const_signature_for(&*node, node.type_ref())
    }

    pub(crate) fn static_signature_query(
        db: &impl PersistentHirDatabase,
        konst: Static,
    ) -> Arc<ConstSignature> {
        let (_, node) = konst.source(db);
        const_signature_for(&*node, node.type_ref())
    }
}

use std::sync::Arc;

use ra_syntax::ast::{NameOwner};

use crate::{
    Name, AsName, Const, ConstSignature, Static,
    type_ref::{TypeRef},
    PersistentHirDatabase,
};

impl ConstSignature {
    pub(crate) fn const_signature_query(
        db: &impl PersistentHirDatabase,
        konst: Const,
    ) -> Arc<ConstSignature> {
        let (_, node) = konst.source(db);

        let name = node.name().map(|n| n.as_name()).unwrap_or_else(Name::missing);

        let type_ref = TypeRef::from_ast_opt(node.type_ref());

        let sig = ConstSignature { name, type_ref };

        Arc::new(sig)
    }

    pub(crate) fn static_signature_query(
        db: &impl PersistentHirDatabase,
        konst: Static,
    ) -> Arc<ConstSignature> {
        let (_, node) = konst.source(db);

        let name = node.name().map(|n| n.as_name()).unwrap_or_else(Name::missing);

        let type_ref = TypeRef::from_ast_opt(node.type_ref());

        let sig = ConstSignature { name, type_ref };

        Arc::new(sig)
    }
}

--- 
+++ 
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use ra_syntax::ast::{self, NameOwner};
+use ra_syntax::ast::{NameOwner};
 
 use crate::{
     Name, AsName, Const, ConstSignature, Static,
@@ -8,23 +8,20 @@
     PersistentHirDatabase,
 };
 
-fn const_signature_for<N: NameOwner>(
-    node: &N,
-    type_ref: Option<&ast::TypeRef>,
-) -> Arc<ConstSignature> {
-    let name = node.name().map(|n| n.as_name()).unwrap_or_else(Name::missing);
-    let type_ref = TypeRef::from_ast_opt(type_ref);
-    let sig = ConstSignature { name, type_ref };
-    Arc::new(sig)
-}
-
 impl ConstSignature {
     pub(crate) fn const_signature_query(
         db: &impl PersistentHirDatabase,
         konst: Const,
     ) -> Arc<ConstSignature> {
         let (_, node) = konst.source(db);
-        const_signature_for(&*node, node.type_ref())
+
+        let name = node.name().map(|n| n.as_name()).unwrap_or_else(Name::missing);
+
+        let type_ref = TypeRef::from_ast_opt(node.type_ref());
+
+        let sig = ConstSignature { name, type_ref };
+
+        Arc::new(sig)
     }
 
     pub(crate) fn static_signature_query(
@@ -32,6 +29,13 @@
         konst: Static,
     ) -> Arc<ConstSignature> {
         let (_, node) = konst.source(db);
-        const_signature_for(&*node, node.type_ref())
+
+        let name = node.name().map(|n| n.as_name()).unwrap_or_else(Name::missing);
+
+        let type_ref = TypeRef::from_ast_opt(node.type_ref());
+
+        let sig = ConstSignature { name, type_ref };
+
+        Arc::new(sig)
     }
 }
Move ConstSignature creation to a single method
