Merge #3876

3876: Better naming for scope completion r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <[email protected]>

3 files changed, 6 insertions, 6 deletions

diff --git a/crates/ra_ide/src/completion.rs b/crates/ra_ide/src/completion.rs
index 93157bbba..4a1a2a04a 100644
--- a/crates/ra_ide/src/completion.rs
+++ b/crates/ra_ide/src/completion.rs
@@ -10,8 +10,8 @@ mod complete_pattern;
 mod complete_fn_param;
 mod complete_keyword;
 mod complete_snippet;
-mod complete_path;
-mod complete_scope;
+mod complete_qualified_path;
+mod complete_unqualified_path;
 mod complete_postfix;
 mod complete_macro_in_item_position;
 mod complete_trait_impl;
@@ -85,8 +85,8 @@ pub(crate) fn completions(
     complete_keyword::complete_use_tree_keyword(&mut acc, &ctx);
     complete_snippet::complete_expr_snippet(&mut acc, &ctx);
     complete_snippet::complete_item_snippet(&mut acc, &ctx);
-    complete_path::complete_path(&mut acc, &ctx);
-    complete_scope::complete_scope(&mut acc, &ctx);
+    complete_qualified_path::complete_qualified_path(&mut acc, &ctx);
+    complete_unqualified_path::complete_unqualified_path(&mut acc, &ctx);
     complete_dot::complete_dot(&mut acc, &ctx);
     complete_record::complete_record(&mut acc, &ctx);
     complete_pattern::complete_pattern(&mut acc, &ctx);
diff --git a/crates/ra_ide/src/completion/complete_path.rs b/crates/ra_ide/src/completion/complete_qualified_path.rs
index 3ed2ae2b6..d98523406 100644
--- a/crates/ra_ide/src/completion/complete_path.rs
+++ b/crates/ra_ide/src/completion/complete_qualified_path.rs
@@ -6,7 +6,7 @@ use test_utils::tested_by;
 
 use crate::completion::{CompletionContext, Completions};
 
-pub(super) fn complete_path(acc: &mut Completions, ctx: &CompletionContext) {
+pub(super) fn complete_qualified_path(acc: &mut Completions, ctx: &CompletionContext) {
     let path = match &ctx.path_prefix {
         Some(path) => path.clone(),
         _ => return,
diff --git a/crates/ra_ide/src/completion/complete_scope.rs b/crates/ra_ide/src/completion/complete_unqualified_path.rs
index 665597e4c..efde9bf73 100644
--- a/crates/ra_ide/src/completion/complete_scope.rs
+++ b/crates/ra_ide/src/completion/complete_unqualified_path.rs
@@ -2,7 +2,7 @@
 
 use crate::completion::{CompletionContext, Completions};
 
-pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) {
+pub(super) fn complete_unqualified_path(acc: &mut Completions, ctx: &CompletionContext) {
     if !(ctx.is_trivial_path && !ctx.is_pat_binding_or_const) {
         return;
     }