From 45298b5d2a8e7d1f962f3117de27957e393c03e2 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukastw97@gmail.com>
Date: Wed, 16 Sep 2020 20:33:08 +0200
Subject: [PATCH] Add make::glob_use_tree function to create star-only UseTree

---
 crates/assists/src/utils/insert_use.rs | 14 +++-----------
 crates/syntax/src/ast/make.rs          |  4 ++++
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/crates/assists/src/utils/insert_use.rs b/crates/assists/src/utils/insert_use.rs
index 4972085d693..97ac6b8322b 100644
--- a/crates/assists/src/utils/insert_use.rs
+++ b/crates/assists/src/utils/insert_use.rs
@@ -233,15 +233,7 @@ fn recursive_merge(
                             None,
                             false,
                         );
-                        use_trees.insert(
-                            idx,
-                            make::use_tree(
-                                make::path_unqualified(make::path_segment_self()),
-                                None,
-                                None,
-                                true,
-                            ),
-                        );
+                        use_trees.insert(idx, make::glob_use_tree());
                         continue;
                     }
                 }
@@ -806,14 +798,14 @@ fn merge_mod_into_glob() {
         check_full(
             "token::TokenKind",
             r"use token::TokenKind::*;",
-            r"use token::TokenKind::{self::*, self};",
+            r"use token::TokenKind::{*, self};",
         )
         // FIXME: have it emit `use token::TokenKind::{self, *}`?
     }
 
     #[test]
     fn merge_self_glob() {
-        check_full("self", r"use self::*;", r"use self::{self::*, self};")
+        check_full("self", r"use self::*;", r"use self::{*, self};")
         // FIXME: have it emit `use {self, *}`?
     }
 
diff --git a/crates/syntax/src/ast/make.rs b/crates/syntax/src/ast/make.rs
index 25e8a359d9e..6868feed997 100644
--- a/crates/syntax/src/ast/make.rs
+++ b/crates/syntax/src/ast/make.rs
@@ -38,6 +38,10 @@ pub fn path_from_text(text: &str) -> ast::Path {
     ast_from_text(text)
 }
 
+pub fn glob_use_tree() -> ast::UseTree {
+    ast_from_text("use *;")
+}
+
 pub fn use_tree(
     path: ast::Path,
     use_tree_list: Option<ast::UseTreeList>,