Fix list use formatting

Author: wafarm

src/imports.rs

@@ -627,8 +627,21 @@ impl UseTree {
         }
 
         // Recursively normalize elements of a list use (including sorting the list).
+        let mut should_renormalize = false;
         if let UseSegmentKind::List(list) = last.kind {
-            let mut list = list.into_iter().map(UseTree::normalize).collect::<Vec<_>>();
+            let original_size = list.len();
+            let mut list = list
+                .into_iter()
+                .map(UseTree::normalize)
+                // Filter away empty elements
+                .filter(|elem| !elem.path.is_empty())
+                .collect::<Vec<_>>();
+
+            // We need to normalize again if list length is reduced to
+            // 0 (may remove) or 1 (may extract the element)
+            should_renormalize =
+                original_size != list.len() && (list.len() == 0 || list.len() == 1);
+
             list.sort();
             last = UseSegment {
                 kind: UseSegmentKind::List(list),
@@ -637,7 +650,12 @@ impl UseTree {
         }
 
         self.path.push(last);
-        self
+
+        if should_renormalize {
+            self.normalize()
+        } else {
+            self
+        }
     }
 
     fn has_comment(&self) -> bool {

tests/source/issue-6277/one.rs

@@ -0,0 +1,5 @@
+use core::{
+    slice,
+    
+    fmt::{},
+};

tests/source/issue-6277/two.rs

@@ -0,0 +1,5 @@
+use core::{
+    
+    fmt::{Debug, Display},
+    slice::{},
+};

tests/target/issue-6277/one.rs

@@ -0,0 +1 @@
+use core::slice;

tests/target/issue-6277/two.rs

@@ -0,0 +1 @@
+use core::fmt::{Debug, Display};