From a1a23d343a10bd5124fb7d01d058566cb4748af2 Mon Sep 17 00:00:00 2001 From: DropDemBits Date: Mon, 14 Feb 2022 20:41:01 -0500 Subject: [PATCH] Apply review fixes --- crates/ide_assists/src/handlers/merge_imports.rs | 4 +++- 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 2ded8c980372..68aa741face2 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 f113dccdea9b..dfaf578cb158 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,