diff --git a/src/changes.rs b/src/changes.rs index 4cce45e5eb3..ab5968dbf76 100644 --- a/src/changes.rs +++ b/src/changes.rs @@ -35,9 +35,11 @@ pub struct ChangeSet<'a> { impl<'a> ChangeSet<'a> { // Create a new ChangeSet for a given libsyntax CodeMap. pub fn from_codemap(codemap: &'a CodeMap) -> ChangeSet<'a> { - let mut result = ChangeSet { file_map: HashMap::new(), - codemap: codemap, - file_spans: Vec::with_capacity(codemap.files.borrow().len()), }; + let mut result = ChangeSet { + file_map: HashMap::new(), + codemap: codemap, + file_spans: Vec::with_capacity(codemap.files.borrow().len()), + }; for f in codemap.files.borrow().iter() { // Use the length of the file as a heuristic for how much space we diff --git a/src/comment.rs b/src/comment.rs index 064cace6c51..7e4119880c3 100644 --- a/src/comment.rs +++ b/src/comment.rs @@ -24,13 +24,15 @@ pub fn rewrite_comment(orig: &str, block_style: bool, width: usize, offset: usiz let max_chars = width.checked_sub(closer.len()).unwrap_or(1) .checked_sub(opener.len()).unwrap_or(1); - let fmt = StringFormat { opener: "", - closer: "", - line_start: line_start, - line_end: "", - width: max_chars, - offset: offset + opener.len() - line_start.len(), - trim_end: true, }; + let fmt = StringFormat { + opener: "", + closer: "", + line_start: line_start, + line_end: "", + width: max_chars, + offset: offset + opener.len() - line_start.len(), + trim_end: true, + }; let indent_str = make_indent(offset); let line_breaks = s.chars().filter(|&c| c == '\n').count(); diff --git a/src/expr.rs b/src/expr.rs index c6e9a84421a..e6390a08793 100644 --- a/src/expr.rs +++ b/src/expr.rs @@ -101,13 +101,15 @@ fn rewrite_string_lit(context: &RewriteContext, if l_loc.line == r_loc.line && r_loc.col.to_usize() <= context.config.max_width { return context.codemap.span_to_snippet(span).ok(); } - let fmt = StringFormat { opener: "\"", - closer: "\"", - line_start: " ", - line_end: "\\", - width: width, - offset: offset, - trim_end: false, }; + let fmt = StringFormat { + opener: "\"", + closer: "\"", + line_start: " ", + line_end: "\\", + width: width, + offset: offset, + trim_end: false, + }; Some(rewrite_string(&s.escape_default(), &fmt)) } @@ -147,13 +149,15 @@ fn rewrite_call(context: &RewriteContext, callee.span.hi + BytePos(1), span.hi); - let fmt = ListFormatting { tactic: ListTactic::HorizontalVertical, - separator: ",", - trailing_separator: SeparatorTactic::Never, - indent: offset, - h_width: remaining_width, - v_width: remaining_width, - ends_with_newline: true, }; + let fmt = ListFormatting { + tactic: ListTactic::HorizontalVertical, + separator: ",", + trailing_separator: SeparatorTactic::Never, + indent: offset, + h_width: remaining_width, + v_width: remaining_width, + ends_with_newline: true, + }; Some(format!("{}({})", callee_str, write_list(&items, &fmt))) } @@ -239,17 +243,19 @@ fn rewrite_struct_lit<'a>(context: &RewriteContext, span_after(span, "{", context.codemap), span.hi); - let fmt = ListFormatting { tactic: ListTactic::HorizontalVertical, - separator: ",", - trailing_separator: if base.is_some() { + let fmt = ListFormatting { + tactic: ListTactic::HorizontalVertical, + separator: ",", + trailing_separator: if base.is_some() { SeparatorTactic::Never } else { context.config.struct_lit_trailing_comma }, - indent: indent, - h_width: budget, - v_width: budget, - ends_with_newline: true, }; + indent: indent, + h_width: budget, + v_width: budget, + ends_with_newline: true, + }; let fields_str = write_list(&items, &fmt); match context.config.struct_lit_style { @@ -305,13 +311,15 @@ fn rewrite_tuple_lit(context: &RewriteContext, span.lo + BytePos(1), // Remove parens span.hi - BytePos(1)); - let fmt = ListFormatting { tactic: ListTactic::HorizontalVertical, - separator: ",", - trailing_separator: SeparatorTactic::Never, - indent: indent, - h_width: width - 2, - v_width: width - 2, - ends_with_newline: true, }; + let fmt = ListFormatting { + tactic: ListTactic::HorizontalVertical, + separator: ",", + trailing_separator: SeparatorTactic::Never, + indent: indent, + h_width: width - 2, + v_width: width - 2, + ends_with_newline: true, + }; Some(format!("({})", write_list(&items, &fmt))) } diff --git a/src/imports.rs b/src/imports.rs index d9eb7b772a3..45a8e94dee5 100644 --- a/src/imports.rs +++ b/src/imports.rs @@ -71,13 +71,15 @@ impl<'a> FmtVisitor<'a> { let remaining_line_budget = one_line_budget.checked_sub(used_width).unwrap_or(0); let remaining_multi_budget = multi_line_budget.checked_sub(used_width).unwrap_or(0); - let fmt = ListFormatting { tactic: ListTactic::Mixed, - separator: ",", - trailing_separator: SeparatorTactic::Never, - indent: block_indent + indent, - h_width: remaining_line_budget, - v_width: remaining_multi_budget, - ends_with_newline: true, }; + let fmt = ListFormatting { + tactic: ListTactic::Mixed, + separator: ",", + trailing_separator: SeparatorTactic::Never, + indent: block_indent + indent, + h_width: remaining_line_budget, + v_width: remaining_multi_budget, + ends_with_newline: true, + }; let mut items = itemize_list(self.codemap, vec![ListItem::from_str("")], /* Dummy value, explanation diff --git a/src/issues.rs b/src/issues.rs index bb7e9ba14e3..31f544605b5 100644 --- a/src/issues.rs +++ b/src/issues.rs @@ -96,9 +96,11 @@ pub struct BadIssueSeeker { impl BadIssueSeeker { pub fn new(report_todo: ReportTactic, report_fixme: ReportTactic) -> BadIssueSeeker { - BadIssueSeeker { state: Seeking::Issue { todo_idx: 0, fixme_idx: 0 }, - report_todo: report_todo, - report_fixme: report_fixme, } + BadIssueSeeker { + state: Seeking::Issue { todo_idx: 0, fixme_idx: 0 }, + report_todo: report_todo, + report_fixme: report_fixme, + } } // Check whether or not the current char is conclusive evidence for an diff --git a/src/items.rs b/src/items.rs index 0f7f44f8d99..42a0d609dd0 100644 --- a/src/items.rs +++ b/src/items.rs @@ -305,13 +305,15 @@ impl<'a> FmtVisitor<'a> { item.item = arg; } - let fmt = ListFormatting { tactic: ListTactic::HorizontalVertical, - separator: ",", - trailing_separator: SeparatorTactic::Never, - indent: arg_indent, - h_width: one_line_budget, - v_width: multi_line_budget, - ends_with_newline: true, }; + let fmt = ListFormatting { + tactic: ListTactic::HorizontalVertical, + separator: ",", + trailing_separator: SeparatorTactic::Never, + indent: arg_indent, + h_width: one_line_budget, + v_width: multi_line_budget, + ends_with_newline: true, + }; write_list(&arg_items, &fmt) } @@ -566,13 +568,15 @@ impl<'a> FmtVisitor<'a> { // 1 = , let budget = self.config.ideal_width - offset + self.config.tab_spaces - 1; - let fmt = ListFormatting { tactic: tactic, - separator: ",", - trailing_separator: self.config.struct_trailing_comma, - indent: offset + self.config.tab_spaces, - h_width: self.config.max_width, - v_width: budget, - ends_with_newline: false, }; + let fmt = ListFormatting { + tactic: tactic, + separator: ",", + trailing_separator: self.config.struct_trailing_comma, + indent: offset + self.config.tab_spaces, + h_width: self.config.max_width, + v_width: budget, + ends_with_newline: false, + }; result.push_str(&write_list(&items, &fmt)); @@ -707,13 +711,15 @@ impl<'a> FmtVisitor<'a> { item.item = ty; } - let fmt = ListFormatting { tactic: ListTactic::HorizontalVertical, - separator: ",", - trailing_separator: SeparatorTactic::Never, - indent: offset + 1, - h_width: budget, - v_width: budget, - ends_with_newline: true, }; + let fmt = ListFormatting { + tactic: ListTactic::HorizontalVertical, + separator: ",", + trailing_separator: SeparatorTactic::Never, + indent: offset + 1, + h_width: budget, + v_width: budget, + ends_with_newline: true, + }; result.push_str(&write_list(&items, &fmt)); result.push('>'); @@ -748,13 +754,15 @@ impl<'a> FmtVisitor<'a> { span_end); let budget = self.config.ideal_width + self.config.leeway - indent - 10; - let fmt = ListFormatting { tactic: ListTactic::Vertical, - separator: ",", - trailing_separator: SeparatorTactic::Never, - indent: indent + 10, - h_width: budget, - v_width: budget, - ends_with_newline: true, }; + let fmt = ListFormatting { + tactic: ListTactic::Vertical, + separator: ",", + trailing_separator: SeparatorTactic::Never, + indent: indent + 10, + h_width: budget, + v_width: budget, + ends_with_newline: true, + }; result.push_str(&write_list(&items, &fmt)); result diff --git a/src/visitor.rs b/src/visitor.rs index 1b1fd9d17c6..53446d6e119 100644 --- a/src/visitor.rs +++ b/src/visitor.rs @@ -38,9 +38,11 @@ impl<'a, 'v> visit::Visitor<'v> for FmtVisitor<'a> { self.codemap.lookup_char_pos(ex.span.hi)); self.format_missing(ex.span.lo); let offset = self.changes.cur_offset_span(ex.span); - let context = RewriteContext { codemap: self.codemap, - config: self.config, - block_indent: self.block_indent, }; + let context = RewriteContext { + codemap: self.codemap, + config: self.config, + block_indent: self.block_indent, + }; let rewrite = ex.rewrite(&context, self.config.max_width - offset, offset); if let Some(new_str) = rewrite { @@ -284,11 +286,13 @@ impl<'a, 'v> visit::Visitor<'v> for FmtVisitor<'a> { impl<'a> FmtVisitor<'a> { pub fn from_codemap<'b>(codemap: &'b CodeMap, config: &'b Config) -> FmtVisitor<'b> { - FmtVisitor { codemap: codemap, - changes: ChangeSet::from_codemap(codemap), - last_pos: BytePos(0), - block_indent: 0, - config: config, } + FmtVisitor { + codemap: codemap, + changes: ChangeSet::from_codemap(codemap), + last_pos: BytePos(0), + block_indent: 0, + config: config, + } } pub fn snippet(&self, span: Span) -> String {