mirror of
https://github.com/rust-lang/rust.git
synced 2026-05-15 20:45:45 +03:00
fix merge_mix
This commit is contained in:
+11
-10
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user