language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-14 17:59:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

remove as _ on auto importing on trait that is aliased with _

Browse source
This commit is contained in:
dfireBird 2023-07-22 19:51:34 +05:30
parent cc6c8209cb
commit d79486529e
No known key found for this signature in database
GPG key ID: 26D522CA5FC2B93D
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/ide-db/src/imports/merge_imports.rs
View file

@ -78,6 +78,10 @@ fn try_merge_trees_mut(lhs: &ast::UseTree, rhs: &ast::UseTree, merge: MergeBehav
{ {
lhs.split_prefix(&lhs_prefix); lhs.split_prefix(&lhs_prefix);
rhs.split_prefix(&rhs_prefix); rhs.split_prefix(&rhs_prefix);
} else {
ted::replace(lhs.syntax(), rhs.syntax());
// we can safely return here, in this case `recursive_merge` doesn't do anything
return Some(());
} }
recursive_merge(lhs, rhs, merge) recursive_merge(lhs, rhs, merge)
} }
@ -123,6 +127,13 @@ fn recursive_merge(lhs: &ast::UseTree, rhs: &ast::UseTree, merge: MergeBehavior)
// so they need to be handled explicitly // so they need to be handled explicitly
.or_else(|| tree.star_token().map(|_| false)) .or_else(|| tree.star_token().map(|_| false))
}; };
if lhs_t.rename().and_then(|x| x.underscore_token()).is_some() {
ted::replace(lhs_t.syntax(), rhs_t.syntax());
*lhs_t = rhs_t;
continue;
}
match (tree_contains_self(lhs_t), tree_contains_self(&rhs_t)) { match (tree_contains_self(lhs_t), tree_contains_self(&rhs_t)) {
(Some(true), None) => continue, (Some(true), None) => continue,
(None, Some(true)) => { (None, Some(true)) => {