Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-14 17:07:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add make::glob_use_tree function to create star-only UseTree

Browse source
This commit is contained in:
Lukas Wirth 2020-09-16 20:33:08 +02:00
parent b874721752
commit 45298b5d2a
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
crates/assists/src/utils/insert_use.rs
View file

@ -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 @@ use std::io;",
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, *}`?
}

4
crates/syntax/src/ast/make.rs
View file

@ -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>,