3 files changed, 14 insertions, 33 deletions

diff --git a/crates/ide_assists/src/handlers/expand_glob_import.rs b/crates/ide_assists/src/handlers/expand_glob_import.rs
index 5b540df5c..83aa11d52 100644
--- a/crates/ide_assists/src/handlers/expand_glob_import.rs
+++ b/crates/ide_assists/src/handlers/expand_glob_import.rs
@@ -73,8 +73,8 @@ fn find_parent_and_path(
 ) -> Option<(Either<ast::UseTree, ast::UseTreeList>, ast::Path)> {
     return star.ancestors().find_map(|n| {
         find_use_tree_list(n.clone())
-            .and_then(|(u, p)| Some((Either::Right(u), p)))
-            .or_else(|| find_use_tree(n).and_then(|(u, p)| Some((Either::Left(u), p))))
+            .map(|(u, p)| (Either::Right(u), p))
+            .or_else(|| find_use_tree(n).map(|(u, p)| (Either::Left(u), p)))
     });
 
     fn find_use_tree_list(n: SyntaxNode) -> Option<(ast::UseTreeList, ast::Path)> {
diff --git a/crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs b/crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs
index 335e0ed95..596c536a7 100644
--- a/crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs
+++ b/crates/ide_assists/src/handlers/extract_struct_from_enum_variant.rs
@@ -145,11 +145,8 @@ fn insert_import(
     variant_hir_name: &Name,
 ) -> Option<()> {
     let db = ctx.db();
-    let mod_path = module.find_use_path_prefixed(
-        db,
-        enum_module_def.clone(),
-        ctx.config.insert_use.prefix_kind,
-    );
+    let mod_path =
+        module.find_use_path_prefixed(db, *enum_module_def, ctx.config.insert_use.prefix_kind);
     if let Some(mut mod_path) = mod_path {
         mod_path.pop_segment();
         mod_path.push_segment(variant_hir_name.clone());
diff --git a/crates/ide_assists/src/handlers/move_bounds.rs b/crates/ide_assists/src/handlers/move_bounds.rs
index 48efa67ed..9ad0c9816 100644
--- a/crates/ide_assists/src/handlers/move_bounds.rs
+++ b/crates/ide_assists/src/handlers/move_bounds.rs
@@ -40,9 +40,9 @@ pub(crate) fn move_bounds_to_where_clause(acc: &mut Assists, ctx: &AssistContext
             let where_clause: ast::WhereClause = match_ast! {
                 match parent {
                     ast::Fn(it) => it.get_or_create_where_clause(),
-                    // ast::Trait(it) => it.get_or_create_where_clause(),
+                    ast::Trait(it) => it.get_or_create_where_clause(),
                     ast::Impl(it) => it.get_or_create_where_clause(),
-                    // ast::Enum(it) => it.get_or_create_where_clause(),
+                    ast::Enum(it) => it.get_or_create_where_clause(),
                     ast::Struct(it) => it.get_or_create_where_clause(),
                     _ => return,
                 }
@@ -82,12 +82,8 @@ mod tests {
     fn move_bounds_to_where_clause_fn() {
         check_assist(
             move_bounds_to_where_clause,
-            r#"
-            fn foo<T: u32, $0F: FnOnce(T) -> T>() {}
-            "#,
-            r#"
-            fn foo<T, F>() where T: u32, F: FnOnce(T) -> T {}
-            "#,
+            r#"fn foo<T: u32, $0F: FnOnce(T) -> T>() {}"#,
+            r#"fn foo<T, F>() where T: u32, F: FnOnce(T) -> T {}"#,
         );
     }
 
@@ -95,12 +91,8 @@ mod tests {
     fn move_bounds_to_where_clause_impl() {
         check_assist(
             move_bounds_to_where_clause,
-            r#"
-            impl<U: u32, $0T> A<U, T> {}
-            "#,
-            r#"
-            impl<U, T> A<U, T> where U: u32 {}
-            "#,
+            r#"impl<U: u32, $0T> A<U, T> {}"#,
+            r#"impl<U, T> A<U, T> where U: u32 {}"#,
         );
     }
 
@@ -108,12 +100,8 @@ mod tests {
     fn move_bounds_to_where_clause_struct() {
         check_assist(
             move_bounds_to_where_clause,
-            r#"
-            struct A<$0T: Iterator<Item = u32>> {}
-            "#,
-            r#"
-            struct A<T> where T: Iterator<Item = u32> {}
-            "#,
+            r#"struct A<$0T: Iterator<Item = u32>> {}"#,
+            r#"struct A<T> where T: Iterator<Item = u32> {}"#,
         );
     }
 
@@ -121,12 +109,8 @@ mod tests {
     fn move_bounds_to_where_clause_tuple_struct() {
         check_assist(
             move_bounds_to_where_clause,
-            r#"
-            struct Pair<$0T: u32>(T, T);
-            "#,
-            r#"
-            struct Pair<T>(T, T) where T: u32;
-            "#,
+            r#"struct Pair<$0T: u32>(T, T);"#,
+            r#"struct Pair<T>(T, T) where T: u32;"#,
         );
     }
 }