mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move vertical mode override to write_list

Browse Source
This commit is contained in:
Marcus Klaas 2015-06-04 13:47:35 +02:00
parent 826a2fb144
commit 1ef7e23dd1
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/expr.rs
View File

@ -105,14 +105,8 @@ impl<'a> FmtVisitor<'a> {
let args: Vec<_> = args.iter().map(|e| (self.rewrite_expr(e,
remaining_width,
offset), String::new())).collect();
// TODO move this into write_list
let tactics = if args.iter().any(|&(ref s, _)| s.contains('\n')) {
ListTactic::Vertical
} else {
ListTactic::HorizontalVertical
};
let fmt = ListFormatting {
tactic: tactics,
tactic: ListTactic::HorizontalVertical,
separator: ",",
trailing_separator: SeparatorTactic::Never,
indent: offset,
@ -161,13 +155,8 @@ impl<'a> FmtVisitor<'a> {
// FIXME comments
let field_strs: Vec<_> = field_strs.into_iter().map(|s| (s, String::new())).collect();
let tactics = if field_strs.iter().any(|&(ref s, _)| s.contains('\n')) {
ListTactic::Vertical
} else {
ListTactic::HorizontalVertical
};
let fmt = ListFormatting {
tactic: tactics,
tactic: ListTactic::HorizontalVertical,
separator: ",",
trailing_separator: if base.is_some() {
SeparatorTactic::Never

3
src/lists.rs
View File

@ -79,7 +79,8 @@ pub fn write_list<'b>(items: &[(String, String)], formatting: &ListFormatting<'b
if tactic == ListTactic::HorizontalVertical {
debug!("write_list: total_width: {}, total_sep_len: {}, h_width: {}",
total_width, total_sep_len, formatting.h_width);
tactic = if fits_single {
tactic = if fits_single &&
!items.iter().any(|&(ref s, _)| s.contains('\n')) {
ListTactic::Horizontal
} else {
ListTactic::Vertical