Merge #3652

3652: Cleanup imports r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>

crates/ra_assists/src/handlers/add_custom_impl.rs

@@ -1,7 +1,5 @@
 //! FIXME: write short doc here
 
-use crate::{Assist, AssistCtx, AssistId};
-
 use join_to_string::join;
 use ra_syntax::{
     ast::{self, AstNode},
@@ -10,6 +8,8 @@ use ra_syntax::{
     TextRange, TextUnit,
 };
 
+use crate::{Assist, AssistCtx, AssistId};
+
 const DERIVE_TRAIT: &str = "derive";
 
 // Assist: add_custom_impl

crates/ra_assists/src/handlers/add_impl.rs

@@ -1,5 +1,4 @@
 use format_buf::format;
-
 use join_to_string::join;
 use ra_syntax::{
     ast::{self, AstNode, NameOwner, TypeParamsOwner},

crates/ra_assists/src/handlers/add_new.rs

@@ -1,3 +1,5 @@
+use std::fmt::Write;
+
 use format_buf::format;
 use hir::Adt;
 use join_to_string::join;
@@ -7,7 +9,6 @@ use ra_syntax::{
     },
     TextUnit, T,
 };
-use std::fmt::Write;
 
 use crate::{Assist, AssistCtx, AssistId};
 

crates/ra_assists/src/handlers/auto_import.rs

@@ -1,8 +1,5 @@
-use crate::{
+use std::collections::BTreeSet;
-    assist_ctx::{Assist, AssistCtx},
+
-    utils::insert_use_statement,
-    AssistId,
-};
 use hir::{
     AsAssocItem, AssocItemContainer, ModPath, Module, ModuleDef, PathResolution, Semantics, Trait,
     Type,
@@ -14,7 +11,12 @@ use ra_syntax::{
     SyntaxNode,
 };
 use rustc_hash::FxHashSet;
-use std::collections::BTreeSet;
+
+use crate::{
+    assist_ctx::{Assist, AssistCtx},
+    utils::insert_use_statement,
+    AssistId,
+};
 
 // Assist: auto_import
 //

crates/ra_assists/src/handlers/fill_match_arms.rs

@@ -3,10 +3,10 @@
 use std::iter;
 
 use hir::{Adt, HasSource, Semantics};
+use ra_ide_db::RootDatabase;
 use ra_syntax::ast::{self, edit::IndentLevel, make, AstNode, NameOwner};
 
 use crate::{Assist, AssistCtx, AssistId};
-use ra_ide_db::RootDatabase;
 
 // Assist: fill_match_arms
 //

crates/ra_assists/src/handlers/invert_if.rs

@@ -1,5 +1,7 @@
-use ra_syntax::ast::{self, AstNode};
+use ra_syntax::{
-use ra_syntax::T;
+    ast::{self, AstNode},
+    T,
+};
 
 use crate::{utils::invert_boolean_expression, Assist, AssistCtx, AssistId};