SigKind -> CallableKind

diff --git a/crates/ra_ide_api/src/display/function_signature.rs b/crates/ra_ide_api/src/display/function_signature.rs
index 736b5d3dbedabe34b026e40b3f504d9bf68ffd78..e21f8378d868fd43b7f476c35d15c3bce8be4db2 100644 (file)
--- a/crates/ra_ide_api/src/display/function_signature.rs
+++ b/crates/ra_ide_api/src/display/function_signature.rs
@@ -13,16 +13,16 @@
 };
 
 #[derive(Debug)]
-pub enum SigKind {
+pub enum CallableKind {
     Function,
-    Struct,
-    EnumVariant,
+    StructConstructor,
+    VariantConstructor,
 }
 
 /// Contains information about a function signature
 #[derive(Debug)]
 pub struct FunctionSignature {
-    pub kind: SigKind,
+    pub kind: CallableKind,
     /// Optional visibility
     pub visibility: Option<String>,
     /// Name of the function
@@ -69,7 +69,7 @@ pub(crate) fn from_struct(db: &db::RootDatabase, st: hir::Struct) -> Option<Self
 
         Some(
             FunctionSignature {
-                kind: SigKind::Struct,
+                kind: CallableKind::StructConstructor,
                 visibility: node.visibility().map(|n| n.syntax().text().to_string()),
                 name: node.name().map(|n| n.text().to_string()),
                 ret_type: node.name().map(|n| n.text().to_string()),
@@ -111,7 +111,7 @@ pub(crate) fn from_enum_variant(
 
         Some(
             FunctionSignature {
-                kind: SigKind::EnumVariant,
+                kind: CallableKind::VariantConstructor,
                 visibility: None,
                 name: Some(name),
                 ret_type: None,
@@ -140,7 +140,7 @@ fn param_list(node: &ast::FnDef) -> Vec<String> {
         }
 
         FunctionSignature {
-            kind: SigKind::Function,
+            kind: CallableKind::Function,
             visibility: node.visibility().map(|n| n.syntax().text().to_string()),
             name: node.name().map(|n| n.text().to_string()),
             ret_type: node
@@ -164,9 +164,9 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
 
         if let Some(name) = &self.name {
             match self.kind {
-                SigKind::Function => write!(f, "fn {}", name)?,
-                SigKind::Struct => write!(f, "struct {}", name)?,
-                SigKind::EnumVariant => write!(f, "{}", name)?,
+                CallableKind::Function => write!(f, "fn {}", name)?,
+                CallableKind::StructConstructor => write!(f, "struct {}", name)?,
+                CallableKind::VariantConstructor => write!(f, "{}", name)?,
             }
         }