Make imports_layout = "Mixed" addressed

src/imports.rs

@@ -693,19 +693,20 @@ fn rewrite_nested_use_tree(
                 _ => false,
             })
     });
-    let (tactic, remaining_width) = if has_nested_list {
-        (DefinitiveListTactic::Vertical, 0)
+
+    let remaining_width = if has_nested_list {
+        0
     } else {
-        let remaining_width = shape.width.checked_sub(2).unwrap_or(0);
-        let tactic = definitive_tactic(
-            &list_items,
-            context.config.imports_layout(),
-            Separator::Comma,
-            remaining_width,
-        );
-        (tactic, remaining_width)
+        shape.width.checked_sub(2).unwrap_or(0)
     };
 
+    let tactic = definitive_tactic(
+        &list_items,
+        context.config.imports_layout(),
+        Separator::Comma,
+        remaining_width,
+    );
+
     let ends_with_newline = context.config.imports_indent() == IndentStyle::Block
         && tactic != DefinitiveListTactic::Horizontal;
     let fmt = ListFormatting {

tests/source/configs/imports_layout/merge_mixed.rs

@@ -0,0 +1,6 @@
+// rustfmt-imports_indent: Block
+// rustfmt-merge_imports: true
+// rustfmt-imports_layout: Mixed
+
+use std::{fmt, io, str};
+use std::str::FromStr;

tests/target/configs/imports_layout/merge_mixed.rs

@@ -0,0 +1,7 @@
+// rustfmt-imports_indent: Block
+// rustfmt-merge_imports: true
+// rustfmt-imports_layout: Mixed
+
+use std::{
+    fmt, io, str::{self, FromStr},
+};

tests/target/imports.rs

@@ -80,30 +80,20 @@ use self::unix::{};
 
 // nested imports
 use foo::{
-    a,
-    b,
+    a, b,
     bar::{
-        baz,
-        foo::{a, b, cxxxxxxxxxxxxx, yyyyyyyyyyyyyy, zzzzzzzzzzzzzzzz},
-        qux,
-        xxxxxxxxxxx,
-        yyyyyyyyyyyyy,
-        zzzzzzzzzzzzzzzz,
+        baz, foo::{a, b, cxxxxxxxxxxxxx, yyyyyyyyyyyyyy, zzzzzzzzzzzzzzzz}, qux, xxxxxxxxxxx,
+        yyyyyyyyyyyyy, zzzzzzzzzzzzzzzz,
     },
-    boo,
-    c,
+    boo, c,
 };
 
 use fooo::{
     baar::foobar::{
         xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx, yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy,
         zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz,
     },
-    bar,
-    bar::*,
-    x,
-    y,
-    z,
+    bar, bar::*, x, y, z,
 };
 
 // nested imports with a single sub-tree.