Merge remote-tracking branch 'origin/master'

1 files changed, 7 insertions, 6 deletions

diff --git a/crates/ra_assists/src/utils/insert_use.rs b/crates/ra_assists/src/utils/insert_use.rs
index 8c4f33e59..32780fceb 100644
--- a/crates/ra_assists/src/utils/insert_use.rs
+++ b/crates/ra_assists/src/utils/insert_use.rs
@@ -4,7 +4,7 @@
 
 use hir::{self, ModPath};
 use ra_syntax::{
-    ast::{self, NameOwner},
+    ast::{self, NameOwner, VisibilityOwner},
     AstNode, Direction, SmolStr,
     SyntaxKind::{PATH, PATH_SEGMENT},
     SyntaxNode, T,
@@ -215,7 +215,7 @@ fn walk_use_tree_for_best_action(
     let prev_len = current_path_segments.len();
 
     let tree_list = current_use_tree.use_tree_list();
-    let alias = current_use_tree.alias();
+    let alias = current_use_tree.rename();
 
     let path = match current_use_tree.path() {
         Some(path) => path,
@@ -225,7 +225,7 @@ fn walk_use_tree_for_best_action(
                 current_use_tree
                     .syntax()
                     .ancestors()
-                    .find_map(ast::UseItem::cast)
+                    .find_map(ast::Use::cast)
                     .map(|it| it.syntax().clone()),
                 true,
             );
@@ -254,7 +254,7 @@ fn walk_use_tree_for_best_action(
             current_use_tree
                 .syntax()
                 .ancestors()
-                .find_map(ast::UseItem::cast)
+                .find_map(ast::Use::cast)
                 .map(|it| it.syntax().clone()),
             true,
         ),
@@ -304,7 +304,7 @@ fn walk_use_tree_for_best_action(
                 current_use_tree
                     .syntax()
                     .ancestors()
-                    .find_map(ast::UseItem::cast)
+                    .find_map(ast::Use::cast)
                     .map(|it| it.syntax().clone()),
                 true,
             );
@@ -377,7 +377,8 @@ fn best_action_for_target(
     let mut storage = Vec::with_capacity(16); // this should be the only allocation
     let best_action = container
         .children()
-        .filter_map(ast::UseItem::cast)
+        .filter_map(ast::Use::cast)
+        .filter(|u| u.visibility().is_none())
         .filter_map(|it| it.use_tree())
         .map(|u| walk_use_tree_for_best_action(&mut storage, None, u, target))
         .fold(None, |best, a| match best {