From a78decc46619a5ab8a19ac69f68ece2a24ff9046 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Sat, 14 Aug 2021 18:28:38 +0300
Subject: [PATCH] internal: make assist naming consistent

---
 ...rly_return.rs => convert_to_guarded_return.rs} |  0
 crates/ide_assists/src/lib.rs                     | 15 ++++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)
 rename crates/ide_assists/src/handlers/{early_return.rs => convert_to_guarded_return.rs} (100%)

diff --git a/crates/ide_assists/src/handlers/early_return.rs b/crates/ide_assists/src/handlers/convert_to_guarded_return.rs
similarity index 100%
rename from crates/ide_assists/src/handlers/early_return.rs
rename to crates/ide_assists/src/handlers/convert_to_guarded_return.rs
diff --git a/crates/ide_assists/src/lib.rs b/crates/ide_assists/src/lib.rs
index 21e2524276a..98a9085a51e 100644
--- a/crates/ide_assists/src/lib.rs
+++ b/crates/ide_assists/src/lib.rs
@@ -61,7 +61,7 @@ mod handlers {
     mod convert_into_to_from;
     mod convert_iter_for_each_to_for;
     mod convert_tuple_struct_to_named_struct;
-    mod early_return;
+    mod convert_to_guarded_return;
     mod expand_glob_import;
     mod extract_function;
     mod extract_struct_from_enum_variant;
@@ -126,14 +126,14 @@ mod handlers {
             apply_demorgan::apply_demorgan,
             auto_import::auto_import,
             change_visibility::change_visibility,
-            convert_bool_then::convert_if_to_bool_then,
             convert_bool_then::convert_bool_then_to_if,
+            convert_bool_then::convert_if_to_bool_then,
             convert_comment_block::convert_comment_block,
             convert_integer_literal::convert_integer_literal,
             convert_into_to_from::convert_into_to_from,
             convert_iter_for_each_to_for::convert_iter_for_each_to_for,
+            convert_to_guarded_return::convert_to_guarded_return,
             convert_tuple_struct_to_named_struct::convert_tuple_struct_to_named_struct,
-            early_return::convert_to_guarded_return,
             expand_glob_import::expand_glob_import,
             extract_struct_from_enum_variant::extract_struct_from_enum_variant,
             extract_type_alias::extract_type_alias,
@@ -144,7 +144,6 @@ mod handlers {
             flip_trait_bound::flip_trait_bound,
             generate_default_from_enum_variant::generate_default_from_enum_variant,
             generate_default_from_new::generate_default_from_new,
-            generate_is_empty_from_len::generate_is_empty_from_len,
             generate_deref::generate_deref,
             generate_derive::generate_derive,
             generate_enum_is_method::generate_enum_is_method,
@@ -152,11 +151,9 @@ mod handlers {
             generate_enum_projection_method::generate_enum_try_into_method,
             generate_from_impl_for_enum::generate_from_impl_for_enum,
             generate_function::generate_function,
-            generate_getter::generate_getter,
-            generate_getter::generate_getter_mut,
             generate_impl::generate_impl,
+            generate_is_empty_from_len::generate_is_empty_from_len,
             generate_new::generate_new,
-            generate_setter::generate_setter,
             infer_function_return_type::infer_function_return_type,
             inline_call::inline_call,
             inline_local_variable::inline_local_variable,
@@ -204,6 +201,10 @@ mod handlers {
             //
             extract_variable::extract_variable,
             extract_function::extract_function,
+            //
+            generate_getter::generate_getter,
+            generate_getter::generate_getter_mut,
+            generate_setter::generate_setter,
             // Are you sure you want to add new assist here, and not to the
             // sorted list above?
         ]