Apply review fixes

Author: DropDemBits

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}};
+",
         )
     }
 

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,