2 files changed, 10 insertions, 15 deletions

diff --git a/crates/assists/src/handlers/replace_qualified_name_with_use.rs b/crates/assists/src/handlers/replace_qualified_name_with_use.rs
index 8bdf9eea5..8193e45a8 100644
--- a/crates/assists/src/handlers/replace_qualified_name_with_use.rs
+++ b/crates/assists/src/handlers/replace_qualified_name_with_use.rs
@@ -407,7 +407,7 @@ impl std::fmt::Display<|> for Foo {
 }
 ",
             r"
-use std::fmt::{nested::Debug, Display};
+use std::fmt::{Display, nested::Debug};
 
 impl Display for Foo {
 }
diff --git a/crates/assists/src/handlers/ignore_test.rs b/crates/assists/src/handlers/toggle_ignore.rs
index 5096a0005..14b420421 100644
--- a/crates/assists/src/handlers/ignore_test.rs
+++ b/crates/assists/src/handlers/toggle_ignore.rs
@@ -5,7 +5,7 @@ use syntax::{
 
 use crate::{utils::test_related_attribute, AssistContext, AssistId, AssistKind, Assists};
 
-// Assist: ignore_test
+// Assist: toggle_ignore
 //
 // Adds `#[ignore]` attribute to the test.
 //
@@ -23,20 +23,20 @@ use crate::{utils::test_related_attribute, AssistContext, AssistId, AssistKind,
 //     assert_eq!(2 + 2, 5);
 // }
 // ```
-pub(crate) fn ignore_test(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
+pub(crate) fn toggle_ignore(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
     let attr: ast::Attr = ctx.find_node_at_offset()?;
     let func = attr.syntax().parent().and_then(ast::Fn::cast)?;
     let attr = test_related_attribute(&func)?;
 
     match has_ignore_attribute(&func) {
         None => acc.add(
-            AssistId("ignore_test", AssistKind::None),
+            AssistId("toggle_ignore", AssistKind::None),
             "Ignore this test",
             attr.syntax().text_range(),
             |builder| builder.insert(attr.syntax().text_range().end(), &format!("\n#[ignore]")),
         ),
         Some(ignore_attr) => acc.add(
-            AssistId("unignore_test", AssistKind::None),
+            AssistId("toggle_ignore", AssistKind::None),
             "Re-enable this test",
             ignore_attr.syntax().text_range(),
             |builder| {
@@ -55,24 +55,19 @@ pub(crate) fn ignore_test(acc: &mut Assists, ctx: &AssistContext) -> Option<()>
 }
 
 fn has_ignore_attribute(fn_def: &ast::Fn) -> Option<ast::Attr> {
-    fn_def.attrs().find_map(|attr| {
-        if attr.path()?.syntax().text() == "ignore" {
-            Some(attr)
-        } else {
-            None
-        }
-    })
+    fn_def.attrs().find(|attr| attr.path().map(|it| it.syntax().text() == "ignore") == Some(true))
 }
 
 #[cfg(test)]
 mod tests {
-    use super::ignore_test;
     use crate::tests::check_assist;
 
+    use super::*;
+
     #[test]
     fn test_base_case() {
         check_assist(
-            ignore_test,
+            toggle_ignore,
             r#"
             #[test<|>]
             fn test() {}
@@ -88,7 +83,7 @@ mod tests {
     #[test]
     fn test_unignore() {
         check_assist(
-            ignore_test,
+            toggle_ignore,
             r#"
             #[test<|>]
             #[ignore]