From edc0190f7a2a701ef7c8534b053070212798cd8b Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 16 Jul 2020 21:33:11 +0200
Subject: Rename

---
 crates/ra_ide/src/completion/complete_trait_impl.rs |  4 ++--
 crates/ra_ide/src/completion/presentation.rs        |  5 +++--
 crates/ra_ide/src/display.rs                        | 10 +++++-----
 crates/ra_ide/src/display/short_label.rs            |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'crates/ra_ide')

diff --git a/crates/ra_ide/src/completion/complete_trait_impl.rs b/crates/ra_ide/src/completion/complete_trait_impl.rs
index 05e605670..cf716540f 100644
--- a/crates/ra_ide/src/completion/complete_trait_impl.rs
+++ b/crates/ra_ide/src/completion/complete_trait_impl.rs
@@ -43,7 +43,7 @@ use crate::{
     completion::{
         CompletionContext, CompletionItem, CompletionItemKind, CompletionKind, Completions,
     },
-    display::function_label,
+    display::function_declaration,
 };
 
 pub(crate) fn complete_trait_impl(acc: &mut Completions, ctx: &CompletionContext) {
@@ -144,7 +144,7 @@ fn add_function_impl(
     };
     let range = TextRange::new(fn_def_node.text_range().start(), ctx.source_range().end());
 
-    let function_decl = function_label(&func.source(ctx.db).value);
+    let function_decl = function_declaration(&func.source(ctx.db).value);
     match ctx.config.snippet_cap {
         Some(cap) => {
             let snippet = format!("{} {{\n    $0\n}}", function_decl);
diff --git a/crates/ra_ide/src/completion/presentation.rs b/crates/ra_ide/src/completion/presentation.rs
index 160f2f319..6aab93e17 100644
--- a/crates/ra_ide/src/completion/presentation.rs
+++ b/crates/ra_ide/src/completion/presentation.rs
@@ -12,7 +12,8 @@ use crate::{
         CompletionKind, Completions,
     },
     display::{
-        const_label, function_label, function_signature::FunctionSignature, macro_label, type_label,
+        const_label, function_declaration, function_signature::FunctionSignature, macro_label,
+        type_label,
     },
     CompletionScore, RootDatabase,
 };
@@ -208,7 +209,7 @@ impl Completions {
                 })
                 .set_documentation(func.docs(ctx.db))
                 .set_deprecated(is_deprecated(func, ctx.db))
-                .detail(function_label(&ast_node));
+                .detail(function_declaration(&ast_node));
 
         let params = function_signature
             .parameter_names
diff --git a/crates/ra_ide/src/display.rs b/crates/ra_ide/src/display.rs
index 9d413cf0a..34ce32e81 100644
--- a/crates/ra_ide/src/display.rs
+++ b/crates/ra_ide/src/display.rs
@@ -10,14 +10,14 @@ use ra_syntax::{
     SyntaxKind::{ATTR, COMMENT},
 };
 
-pub(crate) use navigation_target::{ToNav, TryToNav};
-pub(crate) use short_label::ShortLabel;
-
 use ast::VisibilityOwner;
-pub use navigation_target::NavigationTarget;
 use stdx::format_to;
 
-pub(crate) fn function_label(node: &ast::FnDef) -> String {
+pub use navigation_target::NavigationTarget;
+pub(crate) use navigation_target::{ToNav, TryToNav};
+pub(crate) use short_label::ShortLabel;
+
+pub(crate) fn function_declaration(node: &ast::FnDef) -> String {
     let mut buf = String::new();
     if let Some(vis) = node.visibility() {
         format_to!(buf, "{} ", vis);
diff --git a/crates/ra_ide/src/display/short_label.rs b/crates/ra_ide/src/display/short_label.rs
index d37260e96..5588130a1 100644
--- a/crates/ra_ide/src/display/short_label.rs
+++ b/crates/ra_ide/src/display/short_label.rs
@@ -9,7 +9,7 @@ pub(crate) trait ShortLabel {
 
 impl ShortLabel for ast::FnDef {
     fn short_label(&self) -> Option<String> {
-        Some(crate::display::function_label(self))
+        Some(crate::display::function_declaration(self))
     }
 }
 
-- 
cgit v1.2.3