squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge pull request #2601 from topecongiro/fix-merge-mess

Browse source 
Fix up merge mess
This commit is contained in:
Nick Cameron 2018-04-06 15:32:05 +12:00 committed by GitHub
commit b6645e345e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/imports.rs
View file

@ -460,7 +460,7 @@ fn rewrite_nested_use_tree(
list_item.item = use_tree.rewrite(context, nested_shape); list_item.item = use_tree.rewrite(context, nested_shape);
list_items.push(list_item); list_items.push(list_item);
} }
let tactic = if use_tree_list.iter().any(|use_segment| { let (tactic, remaining_width) = if use_tree_list.iter().any(|use_segment| {
use_segment use_segment
.path .path
.last() .last()
@ -469,14 +469,16 @@ fn rewrite_nested_use_tree(
_ => false, _ => false,
}) })
}) { }) {
DefinitiveListTactic::Vertical (DefinitiveListTactic::Vertical, 0)
} else { } else {
definitive_tactic( let remaining_width = shape.width.checked_sub(2).unwrap_or(0);
let tactic = definitive_tactic(
&list_items, &list_items,
context.config.imports_layout(), context.config.imports_layout(),
Separator::Comma, Separator::Comma,
shape.width.checked_sub(2).unwrap_or(0), remaining_width,
) );
(tactic, remaining_width)
}; };
let ends_with_newline = context.config.imports_indent() == IndentStyle::Block let ends_with_newline = context.config.imports_indent() == IndentStyle::Block
&& tactic != DefinitiveListTactic::Horizontal; && tactic != DefinitiveListTactic::Horizontal;