From 154bf8e1afafed035b769955ed81490dca62a50a Mon Sep 17 00:00:00 2001 From: Seiichi Uchida Date: Mon, 22 Jan 2018 13:05:18 +0900 Subject: [PATCH] Cargo fmt --- src/bin/rustfmt.rs | 8 +++---- src/closures.rs | 2 +- src/comment.rs | 8 +++---- src/expr.rs | 44 +++++++++++++++++++-------------------- src/file_lines.rs | 2 +- src/imports.rs | 6 +++--- src/issues.rs | 13 +++++------- src/items.rs | 46 ++++++++++++++++++++--------------------- src/lib.rs | 2 +- src/lists.rs | 32 ++++++++++++++-------------- src/rustfmt_diff.rs | 2 +- src/shape.rs | 16 +++++++------- src/string.rs | 4 ++-- src/types.rs | 2 +- src/vertical.rs | 2 +- src/visitor.rs | 6 +++--- tests/target/closure.rs | 2 +- tests/target/impl.rs | 2 +- 18 files changed, 98 insertions(+), 101 deletions(-) diff --git a/src/bin/rustfmt.rs b/src/bin/rustfmt.rs index ba586e1fd91..66ee49297a3 100644 --- a/src/bin/rustfmt.rs +++ b/src/bin/rustfmt.rs @@ -453,7 +453,7 @@ fn determine_operation(matches: &Matches) -> FmtResult { return Ok(Operation::Stdin { input: buffer, - config_path: config_path, + config_path, }); } @@ -469,8 +469,8 @@ fn determine_operation(matches: &Matches) -> FmtResult { .collect(); Ok(Operation::Format { - files: files, - config_path: config_path, - minimal_config_path: minimal_config_path, + files, + config_path, + minimal_config_path, }) } diff --git a/src/closures.rs b/src/closures.rs index f63242f6355..fcb985ebf12 100644 --- a/src/closures.rs +++ b/src/closures.rs @@ -244,7 +244,7 @@ fn rewrite_closure_fn_decl( }; let fmt = ListFormatting { - tactic: tactic, + tactic, separator: ",", trailing_separator: SeparatorTactic::Never, separator_place: SeparatorPlace::Back, diff --git a/src/comment.rs b/src/comment.rs index eb9e96f2509..edcd5153fc3 100644 --- a/src/comment.rs +++ b/src/comment.rs @@ -285,11 +285,11 @@ fn rewrite_comment_inner( let mut fmt = StringFormat { opener: "", closer: "", - line_start: line_start, + line_start, line_end: "", shape: Shape::legacy(max_chars, fmt_indent), trim_end: true, - config: config, + config, }; let line_breaks = count_newlines(orig.trim_right()); @@ -895,7 +895,7 @@ pub struct CommentCodeSlices<'a> { impl<'a> CommentCodeSlices<'a> { pub fn new(slice: &'a str) -> CommentCodeSlices<'a> { CommentCodeSlices { - slice: slice, + slice, last_slice_kind: CodeCharKind::Comment, last_slice_end: 0, } @@ -1019,7 +1019,7 @@ fn new(comment: &'a str) -> CommentReducer<'a> { let is_block = comment.starts_with("/*"); let comment = remove_comment_header(comment); CommentReducer { - is_block: is_block, + is_block, at_start_line: false, // There are no supplementary '*' on the first line iter: comment.chars(), } diff --git a/src/expr.rs b/src/expr.rs index 09917ca088b..d59e383389f 100644 --- a/src/expr.rs +++ b/src/expr.rs @@ -441,7 +441,7 @@ pub fn rewrite_array( let ends_with_newline = tactic.ends_with_newline(context.config.indent_style()); let fmt = ListFormatting { - tactic: tactic, + tactic, separator: ",", trailing_separator: if trailing_comma { SeparatorTactic::Always @@ -462,7 +462,7 @@ pub fn rewrite_array( }, separator_place: SeparatorPlace::Back, shape: nested_shape, - ends_with_newline: ends_with_newline, + ends_with_newline, preserve_newline: false, config: context.config, }; @@ -779,19 +779,19 @@ fn new_if( ) -> ControlFlow<'a> { ControlFlow { cond: Some(cond), - block: block, - else_block: else_block, + block, + else_block, label: None, - pat: pat, + pat, keyword: "if", matcher: match pat { Some(..) => "let", None => "", }, connector: " =", - allow_single_line: allow_single_line, - nested_if: nested_if, - span: span, + allow_single_line, + nested_if, + span, } } @@ -802,16 +802,16 @@ fn new_loop( ) -> ControlFlow<'a> { ControlFlow { cond: None, - block: block, + block, else_block: None, - label: label, + label, pat: None, keyword: "loop", matcher: "", connector: "", allow_single_line: false, nested_if: false, - span: span, + span, } } @@ -824,10 +824,10 @@ fn new_while( ) -> ControlFlow<'a> { ControlFlow { cond: Some(cond), - block: block, + block, else_block: None, - label: label, - pat: pat, + label, + pat, keyword: "while", matcher: match pat { Some(..) => "let", @@ -836,7 +836,7 @@ fn new_while( connector: " =", allow_single_line: false, nested_if: false, - span: span, + span, } } @@ -849,16 +849,16 @@ fn new_for( ) -> ControlFlow<'a> { ControlFlow { cond: Some(cond), - block: block, + block, else_block: None, - label: label, + label, pat: Some(pat), keyword: "for", matcher: "", connector: " in", allow_single_line: false, nested_if: false, - span: span, + span, } } @@ -1484,7 +1484,7 @@ fn rewrite_match_pattern( ) }; let fmt = ListFormatting { - tactic: tactic, + tactic, separator: " |", trailing_separator: SeparatorTactic::Never, separator_place: context.config.binop_separator(), @@ -1988,7 +1988,7 @@ fn rewrite_call_args<'a, T>( ); let fmt = ListFormatting { - tactic: tactic, + tactic, separator: ",", trailing_separator: if force_trailing_comma { SeparatorTactic::Always @@ -2671,11 +2671,11 @@ fn rewrite_tuple_in_visual_indent_style<'a, T>( nested_shape.width, ); let fmt = ListFormatting { - tactic: tactic, + tactic, separator: ",", trailing_separator: SeparatorTactic::Never, separator_place: SeparatorPlace::Back, - shape: shape, + shape, ends_with_newline: false, preserve_newline: false, config: context.config, diff --git a/src/file_lines.rs b/src/file_lines.rs index 7f2273c6f69..028c631b1b9 100644 --- a/src/file_lines.rs +++ b/src/file_lines.rs @@ -34,7 +34,7 @@ fn from(range: &'a LineRange) -> Range { impl Range { pub fn new(lo: usize, hi: usize) -> Range { - Range { lo: lo, hi: hi } + Range { lo, hi } } fn is_empty(self) -> bool { diff --git a/src/imports.rs b/src/imports.rs index c49a95b6ff7..2fd85143044 100644 --- a/src/imports.rs +++ b/src/imports.rs @@ -284,7 +284,7 @@ fn rewrite_imports( separator: "", trailing_separator: SeparatorTactic::Never, separator_place: SeparatorPlace::Back, - shape: shape, + shape, ends_with_newline: true, preserve_newline: false, config: context.config, @@ -537,7 +537,7 @@ fn rewrite_nested_use_tree( && tactic != DefinitiveListTactic::Horizontal; let fmt = ListFormatting { - tactic: tactic, + tactic, separator: ",", trailing_separator: if ends_with_newline { context.config.trailing_comma() @@ -546,7 +546,7 @@ fn rewrite_nested_use_tree( }, separator_place: SeparatorPlace::Back, shape: nested_shape, - ends_with_newline: ends_with_newline, + ends_with_newline, preserve_newline: true, config: context.config, }; diff --git a/src/issues.rs b/src/issues.rs index 6cd0586f3e4..2efd61a3d7d 100644 --- a/src/issues.rs +++ b/src/issues.rs @@ -90,8 +90,8 @@ pub fn new(report_todo: ReportTactic, report_fixme: ReportTactic) -> BadIssueSee todo_idx: 0, fixme_idx: 0, }, - report_todo: report_todo, - report_fixme: report_fixme, + report_todo, + report_fixme, } } @@ -169,8 +169,8 @@ fn inspect_issue(&mut self, c: char, mut todo_idx: usize, mut fixme_idx: usize) } Seeking::Issue { - todo_idx: todo_idx, - fixme_idx: fixme_idx, + todo_idx, + fixme_idx, } } @@ -213,10 +213,7 @@ fn inspect_number( NumberPart::CloseParen => {} } - self.state = Seeking::Number { - part: part, - issue: issue, - }; + self.state = Seeking::Number { part, issue }; IssueClassification::None } diff --git a/src/items.rs b/src/items.rs index fcf545a37bd..fdd769ef289 100644 --- a/src/items.rs +++ b/src/items.rs @@ -138,7 +138,7 @@ fn from_foreign_mod(fm: &'a ast::ForeignMod, span: Span, config: &Config) -> Ite .iter() .map(|i| BodyElement::ForeignItem(i)) .collect(), - span: span, + span, } } } @@ -169,8 +169,8 @@ pub fn new( vis: ast::Visibility, ) -> FnSig<'a> { FnSig { - decl: decl, - generics: generics, + decl, + generics, abi: abi::Abi::Rust, constness: ast::Constness::NotConst, defaultness: ast::Defaultness::Final, @@ -189,7 +189,7 @@ pub fn from_method_sig( defaultness: ast::Defaultness::Final, abi: method_sig.abi, decl: &*method_sig.decl, - generics: generics, + generics, visibility: ast::Visibility::Inherited, } } @@ -202,12 +202,12 @@ pub fn from_fn_kind( ) -> FnSig<'a> { match *fn_kind { visit::FnKind::ItemFn(_, unsafety, constness, abi, visibility, _) => FnSig { - decl: decl, - generics: generics, - abi: abi, + decl, + generics, + abi, constness: constness.node, defaultness: defualtness, - unsafety: unsafety, + unsafety, visibility: visibility.clone(), }, visit::FnKind::Method(_, method_sig, vis, _) => { @@ -510,7 +510,7 @@ fn format_variant_list( separator: ",", trailing_separator: self.config.trailing_comma(), separator_place: SeparatorPlace::Back, - shape: shape, + shape, ends_with_newline: true, preserve_newline: true, config: self.config, @@ -895,10 +895,10 @@ pub fn from_item(item: &'a ast::Item) -> Self { _ => unreachable!(), }; StructParts { - prefix: prefix, + prefix, ident: item.ident, vis: &item.vis, - def: def, + def, generics: Some(generics), span: item.span, } @@ -1509,11 +1509,11 @@ pub fn from_item(item: &'a ast::Item) -> Self { _ => unreachable!(), }; StaticParts { - prefix: prefix, + prefix, vis: &item.vis, ident: item.ident, - ty: ty, - mutability: mutability, + ty, + mutability, expr_opt: Some(expr), defaultness: None, span: item.span, @@ -1529,7 +1529,7 @@ pub fn from_trait_item(ti: &'a ast::TraitItem) -> Self { prefix: "const", vis: &ast::Visibility::Inherited, ident: ti.ident, - ty: ty, + ty, mutability: ast::Mutability::Immutable, expr_opt: expr_opt.as_ref(), defaultness: None, @@ -1546,7 +1546,7 @@ pub fn from_impl_item(ii: &'a ast::ImplItem) -> Self { prefix: "const", vis: &ii.vis, ident: ii.ident, - ty: ty, + ty, mutability: ast::Mutability::Immutable, expr_opt: Some(expr), defaultness: Some(ii.defaultness), @@ -1818,7 +1818,7 @@ fn rewrite_fn_base( let one_line_budget = context.budget(used_width + overhead); let shape = Shape { width: one_line_budget, - indent: indent, + indent, offset: used_width, }; let fd = fn_sig.decl; @@ -2085,8 +2085,8 @@ struct WhereClauseOption { impl WhereClauseOption { pub fn new(suppress_comma: bool, snuggle: bool) -> WhereClauseOption { WhereClauseOption { - suppress_comma: suppress_comma, - snuggle: snuggle, + suppress_comma, + snuggle, compress_where: false, } } @@ -2233,7 +2233,7 @@ enum ArgumentKind<'a> { debug!("rewrite_args: budget: {}, tactic: {:?}", budget, tactic); let fmt = ListFormatting { - tactic: tactic, + tactic, separator: ",", trailing_separator: if variadic { SeparatorTactic::Never @@ -2404,7 +2404,7 @@ pub fn format_generics_item_list( one_line_budget, ); let fmt = ListFormatting { - tactic: tactic, + tactic, separator: ",", trailing_separator: if context.config.indent_style() == IndentStyle::Visual { SeparatorTactic::Never @@ -2412,7 +2412,7 @@ pub fn format_generics_item_list( context.config.trailing_comma() }, separator_place: SeparatorPlace::Back, - shape: shape, + shape, ends_with_newline: tactic.ends_with_newline(context.config.indent_style()), preserve_newline: true, config: context.config, @@ -2637,7 +2637,7 @@ fn rewrite_where_clause( } let fmt = ListFormatting { - tactic: tactic, + tactic, separator: ",", trailing_separator: comma_tactic, separator_place: SeparatorPlace::Back, diff --git a/src/lib.rs b/src/lib.rs index 817188925cd..ec846de04db 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -448,7 +448,7 @@ fn format_lines( line: cur_line, kind: error_kind, is_comment: kind.is_comment(), - is_string: is_string, + is_string, line_buffer: line_buffer.clone(), }); } diff --git a/src/lists.rs b/src/lists.rs index 193cd4f3c32..aa1e0b430ef 100644 --- a/src/lists.rs +++ b/src/lists.rs @@ -690,15 +690,15 @@ fn next(&mut self) -> Option { }; ListItem { - pre_comment: pre_comment, - pre_comment_style: pre_comment_style, + pre_comment, + pre_comment_style, item: if self.inner.peek().is_none() && self.leave_last { None } else { (self.get_item_string)(&item) }, - post_comment: post_comment, - new_lines: new_lines, + post_comment, + new_lines, } }) } @@ -724,16 +724,16 @@ pub fn itemize_list<'a, T, I, F1, F2, F3>( F3: Fn(&T) -> Option, { ListItems { - codemap: codemap, + codemap, inner: inner.peekable(), - get_lo: get_lo, - get_hi: get_hi, - get_item_string: get_item_string, - prev_span_end: prev_span_end, - next_span_start: next_span_start, - terminator: terminator, - separator: separator, - leave_last: leave_last, + get_lo, + get_hi, + get_item_string, + prev_span_end, + next_span_start, + terminator, + separator, + leave_last, } } @@ -841,7 +841,7 @@ pub fn struct_lit_formatting<'a>( let ends_with_newline = context.config.indent_style() != IndentStyle::Visual && tactic == DefinitiveListTactic::Vertical; ListFormatting { - tactic: tactic, + tactic, separator: ",", trailing_separator: if force_no_trailing_comma { SeparatorTactic::Never @@ -849,8 +849,8 @@ pub fn struct_lit_formatting<'a>( context.config.trailing_comma() }, separator_place: SeparatorPlace::Back, - shape: shape, - ends_with_newline: ends_with_newline, + shape, + ends_with_newline, preserve_newline: true, config: context.config, } diff --git a/src/rustfmt_diff.rs b/src/rustfmt_diff.rs index d563e6eee3c..1a2f570f89e 100644 --- a/src/rustfmt_diff.rs +++ b/src/rustfmt_diff.rs @@ -31,7 +31,7 @@ pub struct Mismatch { impl Mismatch { fn new(line_number: u32) -> Mismatch { Mismatch { - line_number: line_number, + line_number, lines: Vec::new(), } } diff --git a/src/shape.rs b/src/shape.rs index fffbe2b9913..8fe2e2b18c0 100644 --- a/src/shape.rs +++ b/src/shape.rs @@ -29,8 +29,8 @@ pub struct Indent { impl Indent { pub fn new(block_indent: usize, alignment: usize) -> Indent { Indent { - block_indent: block_indent, - alignment: alignment, + block_indent, + alignment, } } @@ -161,8 +161,8 @@ impl Shape { // |<--->| width pub fn legacy(width: usize, indent: Indent) -> Shape { Shape { - width: width, - indent: indent, + width, + indent, offset: indent.alignment, } } @@ -170,7 +170,7 @@ pub fn legacy(width: usize, indent: Indent) -> Shape { pub fn indented(indent: Indent, config: &Config) -> Shape { Shape { width: config.max_width().checked_sub(indent.width()).unwrap_or(0), - indent: indent, + indent, offset: indent.alignment, } } @@ -187,9 +187,9 @@ pub fn with_max_width(&self, config: &Config) -> Shape { pub fn offset(width: usize, indent: Indent, offset: usize) -> Shape { Shape { - width: width, - indent: indent, - offset: offset, + width, + indent, + offset, } } diff --git a/src/string.rs b/src/string.rs index 43b1ccbcb93..2386d90ec8a 100644 --- a/src/string.rs +++ b/src/string.rs @@ -36,9 +36,9 @@ pub fn new(shape: Shape, config: &'a Config) -> StringFormat<'a> { closer: "\"", line_start: " ", line_end: "\\", - shape: shape, + shape, trim_end: false, - config: config, + config, } } } diff --git a/src/types.rs b/src/types.rs index 588d9100fe6..a7472567a81 100644 --- a/src/types.rs +++ b/src/types.rs @@ -352,7 +352,7 @@ enum ArgumentKind ); let fmt = ListFormatting { - tactic: tactic, + tactic, separator: ",", trailing_separator: if !context.use_block_indent() || variadic { SeparatorTactic::Never diff --git a/src/vertical.rs b/src/vertical.rs index e56410202eb..2ccb5d81339 100644 --- a/src/vertical.rs +++ b/src/vertical.rs @@ -247,7 +247,7 @@ fn rewrite_aligned_items_inner( ); let fmt = ListFormatting { - tactic: tactic, + tactic, separator: ",", trailing_separator: context.config.trailing_comma(), separator_place: SeparatorPlace::Back, diff --git a/src/visitor.rs b/src/visitor.rs index 2d7d140c179..83d5bca4052 100644 --- a/src/visitor.rs +++ b/src/visitor.rs @@ -576,14 +576,14 @@ pub fn from_codemap( snippet_provider: &'a SnippetProvider, ) -> FmtVisitor<'a> { FmtVisitor { - parse_session: parse_session, + parse_session, codemap: parse_session.codemap(), buffer: String::with_capacity(snippet_provider.big_snippet.len() * 2), last_pos: BytePos(0), block_indent: Indent::empty(), - config: config, + config, is_if_else_block: false, - snippet_provider: snippet_provider, + snippet_provider, line_number: 0, skipped_range: vec![], } diff --git a/tests/target/closure.rs b/tests/target/closure.rs index 5bc89d58222..54ad25b1b37 100644 --- a/tests/target/closure.rs +++ b/tests/target/closure.rs @@ -147,7 +147,7 @@ fn issue470() { hair::PatternRef::Hair(pattern), &lvalue, ); - ArgDecl { ty: ty } + ArgDecl { ty } }, ); } diff --git a/tests/target/impl.rs b/tests/target/impl.rs index 99922d406f4..5895c74bcc9 100644 --- a/tests/target/impl.rs +++ b/tests/target/impl.rs @@ -13,7 +13,7 @@ impl Test pub fn new(value: V) -> Self { Test { cloned_value: value.clone(), - value: value, + value, } } } -- 2.44.0