Unnamed repository; edit this file 'description' to name the repository.
Apply review fixes
| -rw-r--r-- | crates/ide_assists/src/handlers/merge_imports.rs | 4 | ||||
| -rw-r--r-- | crates/ide_db/src/helpers/merge_imports.rs | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/crates/ide_assists/src/handlers/merge_imports.rs b/crates/ide_assists/src/handlers/merge_imports.rs index 2ded8c9803..68aa741fac 100644 --- a/crates/ide_assists/src/handlers/merge_imports.rs +++ b/crates/ide_assists/src/handlers/merge_imports.rs @@ -329,7 +329,9 @@ use foo::{bar::{self}}; use std$0::{fmt::*}; use std::{fmt::{self, Display}}; ", - r"use std::{fmt::{self, *, Display}};", + r" +use std::{fmt::{self, *, Display}}; +", ) } diff --git a/crates/ide_db/src/helpers/merge_imports.rs b/crates/ide_db/src/helpers/merge_imports.rs index f113dccdea..dfaf578cb1 100644 --- a/crates/ide_db/src/helpers/merge_imports.rs +++ b/crates/ide_db/src/helpers/merge_imports.rs @@ -117,7 +117,7 @@ fn recursive_merge(lhs: &ast::UseTree, rhs: &ast::UseTree, merge: MergeBehavior) .map(|tree_list| tree_list.use_trees().any(|it| tree_is_self(&it))) // Glob imports aren't part of the use-tree lists, // so they need to be handled explicitly - .or_else(|| tree.star_token().is_some().then(|| false)) + .or_else(|| tree.star_token().map(|_| false)) }; match (tree_contains_self(lhs_t), tree_contains_self(&rhs_t)) { (Some(true), None) => continue, |