Skip to content

Commit 45298b5

Browse files
committed
Add make::glob_use_tree function to create star-only UseTree
1 parent b874721 commit 45298b5

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

crates/assists/src/utils/insert_use.rs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -233,15 +233,7 @@ fn recursive_merge(
233233
None,
234234
false,
235235
);
236-
use_trees.insert(
237-
idx,
238-
make::use_tree(
239-
make::path_unqualified(make::path_segment_self()),
240-
None,
241-
None,
242-
true,
243-
),
244-
);
236+
use_trees.insert(idx, make::glob_use_tree());
245237
continue;
246238
}
247239
}
@@ -806,14 +798,14 @@ use std::io;",
806798
check_full(
807799
"token::TokenKind",
808800
r"use token::TokenKind::*;",
809-
r"use token::TokenKind::{self::*, self};",
801+
r"use token::TokenKind::{*, self};",
810802
)
811803
// FIXME: have it emit `use token::TokenKind::{self, *}`?
812804
}
813805

814806
#[test]
815807
fn merge_self_glob() {
816-
check_full("self", r"use self::*;", r"use self::{self::*, self};")
808+
check_full("self", r"use self::*;", r"use self::{*, self};")
817809
// FIXME: have it emit `use {self, *}`?
818810
}
819811

crates/syntax/src/ast/make.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ pub fn path_from_text(text: &str) -> ast::Path {
3838
ast_from_text(text)
3939
}
4040

41+
pub fn glob_use_tree() -> ast::UseTree {
42+
ast_from_text("use *;")
43+
}
44+
4145
pub fn use_tree(
4246
path: ast::Path,
4347
use_tree_list: Option<ast::UseTreeList>,

0 commit comments

Comments
 (0)