rewrite_string: retain blank lines that are trailing

[rust.git] / src / reorder.rs

diff --git a/src/reorder.rs b/src/reorder.rs
index b6876738cfd6a2236bf8c3cab8a45f98979df1d1..f990e68656590a601c07d82a0db0cbea6237b641 100644 (file)
--- a/src/reorder.rs
+++ b/src/reorder.rs
@@ -140,7 +140,8 @@ fn rewrite_reorderable_items(
                 .map(|use_tree| ListItem {
                     item: use_tree.rewrite_top_level(context, nested_shape),
                     ..use_tree.list_item.unwrap_or_else(ListItem::empty)
-                }).collect();
+                })
+                .collect();
 
             wrap_reorderable_items(context, &item_vec, nested_shape)
         }
@@ -193,12 +194,12 @@ fn from(item: &ast::Item) -> Self {
         }
     }
 
-    fn is_same_item_kind(&self, item: &ast::Item) -> bool {
-        ReorderableItemKind::from(item) == *self
+    fn is_same_item_kind(self, item: &ast::Item) -> bool {
+        ReorderableItemKind::from(item) == self
     }
 
-    fn is_reorderable(&self, config: &Config) -> bool {
-        match *self {
+    fn is_reorderable(self, config: &Config) -> bool {
+        match self {
             ReorderableItemKind::ExternCrate => config.reorder_imports(),
             ReorderableItemKind::Mod => config.reorder_modules(),
             ReorderableItemKind::Use => config.reorder_imports(),
@@ -206,8 +207,8 @@ fn is_reorderable(&self, config: &Config) -> bool {
         }
     }
 
-    fn in_group(&self) -> bool {
-        match *self {
+    fn in_group(self) -> bool {
+        match self {
             ReorderableItemKind::ExternCrate
             | ReorderableItemKind::Mod
             | ReorderableItemKind::Use => true,
@@ -237,7 +238,8 @@ fn walk_reorderable_items(
                         last = current;
                         in_same_group
                     })
-            }).count();
+            })
+            .count();
         let items = &items[..item_length];
 
         let at_least_one_in_file_lines = items