From a43e2b5ae837604511557133f5e7554184465677 Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Sun, 16 Aug 2015 15:58:17 +1200 Subject: [PATCH] Formatting --- src/comment.rs | 6 +++--- src/expr.rs | 26 ++++++++++++------------- src/filemap.rs | 20 +++++++++---------- src/imports.rs | 17 +++++++++-------- src/issues.rs | 10 +++++----- src/items.rs | 21 +++++++++----------- src/lib.rs | 4 ++-- src/lists.rs | 7 ++++--- src/modules.rs | 2 +- src/types.rs | 52 +++++++++++++++++++++++++------------------------- src/utils.rs | 6 +++--- src/visitor.rs | 2 +- 12 files changed, 86 insertions(+), 87 deletions(-) diff --git a/src/comment.rs b/src/comment.rs index 46c698ecbbb..14ca718e318 100644 --- a/src/comment.rs +++ b/src/comment.rs @@ -127,8 +127,8 @@ impl FindUncommented for str { if b != c { needle_iter = pat.chars(); } - }, - None => return Some(i - pat.len()) + } + None => return Some(i - pat.len()), } if possible_comment && (b == '/' || b == '*') { @@ -145,7 +145,7 @@ impl FindUncommented for str { // Handle case where the pattern is a suffix of the search string match needle_iter.next() { Some(_) => None, - None => Some(self.len() - pat.len()) + None => Some(self.len() - pat.len()), } } } diff --git a/src/expr.rs b/src/expr.rs index 3fb8f85295c..db646dafaba 100644 --- a/src/expr.rs +++ b/src/expr.rs @@ -30,7 +30,7 @@ impl Rewrite for ast::Expr { ast::Lit_::LitStr(ref is, _) => { rewrite_string_lit(context, &is, l.span, width, offset) } - _ => context.codemap.span_to_snippet(self.span).ok() + _ => context.codemap.span_to_snippet(self.span).ok(), } } ast::Expr_::ExprCall(ref callee, ref args) => { @@ -105,7 +105,7 @@ impl Rewrite for ast::Expr { ast::Expr_::ExprPath(ref qself, ref path) => { rewrite_path(context, qself.as_ref(), path, width, offset) } - _ => context.codemap.span_to_snippet(self.span).ok() + _ => context.codemap.span_to_snippet(self.span).ok(), } } } @@ -199,7 +199,7 @@ impl<'a> Loop<'a> { keyword: "while ", matcher: match pat { Some(..) => "let ", - None => "" + None => "", }, connector: " =", } @@ -237,7 +237,7 @@ impl<'a> Rewrite for Loop<'a> { self.connector, inner_width, inner_offset)), - None => String::new() + None => String::new(), }; // FIXME: this drops any comment between "loop" and the block. @@ -250,7 +250,7 @@ impl<'a> Rewrite for Loop<'a> { fn rewrite_label(label: Option) -> String { match label { Some(ident) => format!("{}: ", ident), - None => "".to_owned() + None => "".to_owned(), } } @@ -262,9 +262,8 @@ fn rewrite_range(context: &RewriteContext, offset: usize) -> Option { let left_string = match left { - // 2 = .. Some(expr) => try_opt!(expr.rewrite(context, width - 2, offset)), - None => String::new() + None => String::new(), }; let right_string = match right { @@ -273,7 +272,7 @@ fn rewrite_range(context: &RewriteContext, let max_width = (width - 2).checked_sub(left_string.len()).unwrap_or(0); try_opt!(expr.rewrite(context, max_width, offset + 2 + left_string.len())) } - None => String::new() + None => String::new(), }; Some(format!("{}..{}", left_string, right_string)) @@ -354,12 +353,13 @@ impl Rewrite for ast::Arm { let pat_strs = pats.iter().map(|p| p.rewrite(context, // 5 = ` => {` width - 5, - offset + context.config.tab_spaces)).collect::>(); + offset + context.config.tab_spaces)) + .collect::>(); if pat_strs.iter().any(|p| p.is_none()) { return None; } let pat_strs = pat_strs.into_iter().map(|p| p.unwrap()).collect::>(); - + let mut total_width = pat_strs.iter().fold(0, |a, p| a + p.len()); // Add ` | `.len(). total_width += (pat_strs.len() - 1) * 3; @@ -496,7 +496,7 @@ fn rewrite_pat_expr(context: &RewriteContext, pat_offset)); format!("{}{}{}", matcher, pat_string, connector) } - None => String::new() + None => String::new(), }; // Consider only the last line of the pat string. @@ -804,7 +804,7 @@ fn rewrite_binary_op(context: &RewriteContext, let used_width = result.len() + 1; let remaining_width = match result.rfind('\n') { Some(idx) => (offset + width + idx).checked_sub(used_width).unwrap_or(0), - None => width.checked_sub(used_width).unwrap_or(0) + None => width.checked_sub(used_width).unwrap_or(0), }; // Get "full width" rhs and see if it fits on the current line. This @@ -836,7 +836,7 @@ fn rewrite_unary_op(context: &RewriteContext, ast::UnOp::UnUniq => "box ", ast::UnOp::UnDeref => "*", ast::UnOp::UnNot => "!", - ast::UnOp::UnNeg => "-" + ast::UnOp::UnNeg => "-", }; let subexpr = try_opt!(expr.rewrite(context, width - operator_str.len(), offset)); diff --git a/src/filemap.rs b/src/filemap.rs index ff50522eec6..8bb5a7285bb 100644 --- a/src/filemap.rs +++ b/src/filemap.rs @@ -58,18 +58,18 @@ fn write_file(text: &StringBuffer, where T: Write { match config.newline_style { - NewlineStyle::Unix => write!(writer, "{}", text), - NewlineStyle::Windows => { - for (c, _) in text.chars() { - match c { - '\n' => try!(write!(writer, "\r\n")), - '\r' => continue, - c => try!(write!(writer, "{}", c)), - } + NewlineStyle::Unix => write!(writer, "{}", text), + NewlineStyle::Windows => { + for (c, _) in text.chars() { + match c { + '\n' => try!(write!(writer, "\r\n")), + '\r' => continue, + c => try!(write!(writer, "{}", c)), } - Ok(()) - }, + } + Ok(()) } + } } match mode { diff --git a/src/imports.rs b/src/imports.rs index 392e6fb838a..7d7300fb562 100644 --- a/src/imports.rs +++ b/src/imports.rs @@ -15,7 +15,8 @@ use rewrite::{Rewrite, RewriteContext}; use syntax::ast; use syntax::codemap::Span; -// TODO (some day) remove unused imports, expand globs, compress many single imports into a list import +// TODO (some day) remove unused imports, expand globs, compress many single +// imports into a list import. impl Rewrite for ast::ViewPath { // Returns an empty string when the ViewPath is empty (like foo::bar::{}) @@ -39,10 +40,10 @@ impl Rewrite for ast::ViewPath { let path_str = try_opt!(path.rewrite(context, width - ident_str.len() - 4, offset)); Some(if path.segments.last().unwrap().identifier == ident { - path_str - } else { - format!("{} as {}", path_str, ident_str) - }) + path_str + } else { + format!("{} as {}", path_str, ident_str) + }) } } } @@ -81,7 +82,7 @@ pub fn rewrite_use_list(width: usize, match path_list.len() { 0 => return None, 1 => return Some(rewrite_single_use_list(path_str, path_list[0])), - _ => () + _ => (), } // 2 = :: @@ -161,7 +162,7 @@ fn move_self_to_front(items: &mut Vec) -> bool { Some(pos) => { items[0] = items.remove(pos); true - }, - None => false + } + None => false, } } diff --git a/src/issues.rs b/src/issues.rs index 34d5b8ab2c4..e9f8255cc91 100644 --- a/src/issues.rs +++ b/src/issues.rs @@ -29,7 +29,7 @@ impl ReportTactic { match *self { ReportTactic::Always => true, ReportTactic::Unnumbered => true, - ReportTactic::Never => false + ReportTactic::Never => false, } } } @@ -113,7 +113,7 @@ impl BadIssueSeeker { match self.state { Seeking::Issue { todo_idx, fixme_idx } => { self.state = self.inspect_issue(c, todo_idx, fixme_idx); - }, + } Seeking::Number { issue, part } => { let result = self.inspect_number(c, issue, part); @@ -198,19 +198,19 @@ impl BadIssueSeeker { } else { part = NumberPart::Pound; } - }, + } NumberPart::Pound => { if c == '#' { part = NumberPart::Number; } - }, + } NumberPart::Number => { if c >= '0' && c <= '9' { part = NumberPart::CloseParen; } else { return IssueClassification::Bad(issue); } - }, + } NumberPart::CloseParen => {} } diff --git a/src/items.rs b/src/items.rs index 458a7b0b336..79d374f85ec 100644 --- a/src/items.rs +++ b/src/items.rs @@ -411,10 +411,8 @@ impl<'a> FmtVisitor<'a> { result.push('('); - let indent = self.block_indent - + vis.len() - + field.node.name.to_string().len() - + 1; // Open paren + let indent = self.block_indent + vis.len() + field.node.name.to_string().len() + + 1; // Open paren let comma_cost = if self.config.enum_trailing_comma { 1 @@ -449,7 +447,7 @@ impl<'a> FmtVisitor<'a> { } result - }, + } ast::VariantKind::StructVariantKind(ref struct_def) => { // TODO Should limit the width, as we have a trailing comma self.format_struct("", @@ -491,7 +489,7 @@ impl<'a> FmtVisitor<'a> { let is_tuple = match struct_def.fields[0].node.kind { ast::StructFieldKind::NamedField(..) => false, - ast::StructFieldKind::UnnamedField(..) => true + ast::StructFieldKind::UnnamedField(..) => true, }; let (opener, terminator) = if is_tuple { @@ -506,7 +504,7 @@ impl<'a> FmtVisitor<'a> { offset + header_str.len(), codemap::mk_sp(span.lo, struct_def.fields[0].span.lo)), - None => opener.to_owned() + None => opener.to_owned(), }; result.push_str(&generics_str); @@ -632,7 +630,7 @@ impl<'a> FmtVisitor<'a> { }; let vis = match field.node.kind { ast::StructFieldKind::NamedField(_, vis) | - ast::StructFieldKind::UnnamedField(vis) => format_visibility(vis) + ast::StructFieldKind::UnnamedField(vis) => format_visibility(vis), }; let typ = pprust::ty_to_string(&field.node.ty); @@ -645,7 +643,7 @@ impl<'a> FmtVisitor<'a> { match name { Some(name) => format!("{}{}{}: {}", attr_str, vis, name, typ), - None => format!("{}{}{}", attr_str, vis, typ) + None => format!("{}{}{}", attr_str, vis, typ), } } @@ -799,8 +797,7 @@ fn rewrite_explicit_self(explicit_self: &ast::ExplicitSelf, args: &[ast::Arg]) - // this hacky solution caused by absence of `Mutability` in `SelfValue`. let mut_str = { - if let ast::Pat_::PatIdent(ast::BindingMode::BindByValue(mutability), _, _) - = args[0].pat.node { + if let ast::Pat_::PatIdent(ast::BindingMode::BindByValue(mutability), _, _) = args[0].pat.node { format_mutability(mutability) } else { panic!("there is a bug or change in structure of AST, aborting."); @@ -809,7 +806,7 @@ fn rewrite_explicit_self(explicit_self: &ast::ExplicitSelf, args: &[ast::Arg]) - Some(format!("{}self", mut_str)) } - _ => None + _ => None, } } diff --git a/src/lib.rs b/src/lib.rs index cd43be56a99..9ec401b129d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -92,7 +92,7 @@ impl FromStr for WriteMode { "replace" => Ok(WriteMode::Replace), "display" => Ok(WriteMode::Display), "overwrite" => Ok(WriteMode::Overwrite), - _ => Err(()) + _ => Err(()), } } } @@ -243,7 +243,7 @@ fn fmt_lines(file_map: &mut FileMap, config: &Config) -> FormatReport { for (c, b) in text.chars() { if c == '\r' { - continue; + continuecontinue } // Add warnings for bad todos/ fixmes diff --git a/src/lists.rs b/src/lists.rs index 8f1d8a743c2..eadefe2e0fb 100644 --- a/src/lists.rs +++ b/src/lists.rs @@ -213,7 +213,8 @@ pub fn write_list<'b>(items: &[ListItem], formatting: &ListFormatting<'b>) -> St let comment = item.post_comment.as_ref().unwrap(); // Use block-style only for the last item or multiline comments. let block_style = !formatting.ends_with_newline && last || - comment.trim().contains('\n') || comment.trim().len() > width; + comment.trim().contains('\n') || + comment.trim().len() > width; let formatted_comment = rewrite_comment(comment, block_style, width, offset); @@ -381,7 +382,7 @@ fn comment_len(comment: &Option) -> usize { } else { text_len } - }, - &None => 0 + } + &None => 0, } } diff --git a/src/modules.rs b/src/modules.rs index 2f40fd33a55..681bb1c8ade 100644 --- a/src/modules.rs +++ b/src/modules.rs @@ -67,6 +67,6 @@ fn module_file(id: ast::Ident, match parser::Parser::default_submod_path(id, &dir_path, codemap).result { Ok(parser::ModulePathSuccess { path, .. }) => path, - Err(_) => panic!("Couldn't find module {}", id) + Err(_) => panic!("Couldn't find module {}", id), } } diff --git a/src/types.rs b/src/types.rs index ea8787bd846..10ab7b246cd 100644 --- a/src/types.rs +++ b/src/types.rs @@ -157,7 +157,7 @@ fn get_path_separator(codemap: &CodeMap, if c == ':' { return "::" } else if c.is_whitespace() || c == '<' { - continue; + continuecontinue } else { return ""; } @@ -235,7 +235,7 @@ fn rewrite_segment(segment: &ast::PathSegment, ast::PathParameters::ParenthesizedParameters(ref data) => { let output = match data.output { Some(ref ty) => format!(" -> {}", pprust::ty_to_string(&*ty)), - None => String::new() + None => String::new(), }; let list_lo = span_after(codemap::mk_sp(*span_lo, span_hi), "(", context.codemap); @@ -267,7 +267,7 @@ fn rewrite_segment(segment: &ast::PathSegment, format!("({}){}", write_list(&items.collect::>(), &fmt), output) } - _ => String::new() + _ => String::new(), }; Some(format!("{}{}", segment.identifier, params)) @@ -278,57 +278,57 @@ impl Rewrite for ast::WherePredicate { // TODO dead spans? // TODO assumes we'll always fit on one line... Some(match self { - &ast::WherePredicate::BoundPredicate(ast::WhereBoundPredicate{ref bound_lifetimes, + &ast::WherePredicate::BoundPredicate(ast::WhereBoundPredicate{ref bound_lifetimes, ref bounded_ty, ref bounds, ..}) => { - if bound_lifetimes.len() > 0 { - let lifetime_str = bound_lifetimes.iter().map(|lt| { + if bound_lifetimes.len() > 0 { + let lifetime_str = bound_lifetimes.iter().map(|lt| { lt.rewrite(context, width, offset).unwrap() }).collect::>().join(", "); - let type_str = pprust::ty_to_string(bounded_ty); + let type_str = pprust::ty_to_string(bounded_ty); // 8 = "for<> : ".len() - let used_width = lifetime_str.len() + type_str.len() + 8; - let bounds_str = bounds.iter().map(|ty_bound| { + let used_width = lifetime_str.len() + type_str.len() + 8; + let bounds_str = bounds.iter().map(|ty_bound| { ty_bound.rewrite(context, width - used_width, offset + used_width) .unwrap() }).collect::>().join(" + "); - format!("for<{}> {}: {}", lifetime_str, type_str, bounds_str) - } else { - let type_str = pprust::ty_to_string(bounded_ty); + format!("for<{}> {}: {}", lifetime_str, type_str, bounds_str) + } else { + let type_str = pprust::ty_to_string(bounded_ty); // 2 = ": ".len() - let used_width = type_str.len() + 2; - let bounds_str = bounds.iter().map(|ty_bound| { + let used_width = type_str.len() + 2; + let bounds_str = bounds.iter().map(|ty_bound| { ty_bound.rewrite(context, width - used_width, offset + used_width) .unwrap() }).collect::>().join(" + "); - format!("{}: {}", type_str, bounds_str) + format!("{}: {}", type_str, bounds_str) + } } - } - &ast::WherePredicate::RegionPredicate(ast::WhereRegionPredicate{ref lifetime, + &ast::WherePredicate::RegionPredicate(ast::WhereRegionPredicate{ref lifetime, ref bounds, ..}) => { - format!("{}: {}", + format!("{}: {}", pprust::lifetime_to_string(lifetime), bounds.iter().map(pprust::lifetime_to_string) .collect::>().join(" + ")) - } - &ast::WherePredicate::EqPredicate(ast::WhereEqPredicate{ref path, ref ty, ..}) => { - let ty_str = pprust::ty_to_string(ty); + } + &ast::WherePredicate::EqPredicate(ast::WhereEqPredicate{ref path, ref ty, ..}) => { + let ty_str = pprust::ty_to_string(ty); // 3 = " = ".len() - let used_width = 3 + ty_str.len(); - let path_str = try_opt!(path.rewrite(context, + let used_width = 3 + ty_str.len(); + let path_str = try_opt!(path.rewrite(context, width - used_width, offset + used_width)); - format!("{} = {}", path_str, ty_str) - } - }) + format!("{} = {}", path_str, ty_str) + } + }) } } diff --git a/src/utils.rs b/src/utils.rs index f80e1185bae..a8f7a7c7b1d 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -21,7 +21,7 @@ pub fn extra_offset(text: &str, offset: usize) -> usize { match text.rfind('\n') { // 1 for newline character Some(idx) => text.len() - idx - 1 - offset, - None => text.len() + None => text.len(), } } @@ -70,7 +70,7 @@ pub fn make_indent(width: usize) -> String { pub fn format_visibility(vis: Visibility) -> &'static str { match vis { Visibility::Public => "pub ", - Visibility::Inherited => "" + Visibility::Inherited => "", } } @@ -78,7 +78,7 @@ pub fn format_visibility(vis: Visibility) -> &'static str { pub fn format_mutability(mutability: ast::Mutability) -> &'static str { match mutability { ast::Mutability::MutMutable => "mut ", - ast::Mutability::MutImmutable => "" + ast::Mutability::MutImmutable => "", } } diff --git a/src/visitor.rs b/src/visitor.rs index e107a32abf8..86b1197822b 100644 --- a/src/visitor.rs +++ b/src/visitor.rs @@ -351,7 +351,7 @@ impl<'a> FmtVisitor<'a> { let prev_span = codemap::mk_sp(self.last_pos, span.lo); let span_end = match self.snippet(prev_span).rfind('\n') { Some(offset) => self.last_pos + BytePos(offset as u32), - None => span.lo + None => span.lo, }; self.format_missing(span_end); self.last_pos = span.hi;