Format source codes and update tests

Author: topecongiro

src/comment.rs

@@ -821,8 +821,15 @@ fn remove_comment_header(comment: &str) -> &str {
 
 #[cfg(test)]
 mod test {
-    use super::{CharClasses, CodeCharKind, FullCodeCharKind, contains_comment, rewrite_comment,
-                FindUncommented, CommentCodeSlices};
+    use super::{
+        CharClasses,
+        CodeCharKind,
+        FullCodeCharKind,
+        contains_comment,
+        rewrite_comment,
+        FindUncommented,
+        CommentCodeSlices,
+    };
     use {Indent, Shape};
 
     #[test]

src/expr.rs

@@ -15,13 +15,37 @@ use std::fmt::Write;
 use {Indent, Shape, Spanned};
 use codemap::SpanUtils;
 use rewrite::{Rewrite, RewriteContext};
-use lists::{write_list, itemize_list, ListFormatting, SeparatorTactic, ListTactic,
-            DefinitiveListTactic, definitive_tactic, ListItem, struct_lit_shape,
-            struct_lit_tactic, shape_for_tactic, struct_lit_formatting};
+use lists::{
+    write_list,
+    itemize_list,
+    ListFormatting,
+    SeparatorTactic,
+    ListTactic,
+    DefinitiveListTactic,
+    definitive_tactic,
+    ListItem,
+    struct_lit_shape,
+    struct_lit_tactic,
+    shape_for_tactic,
+    struct_lit_formatting,
+};
 use string::{StringFormat, rewrite_string};
-use utils::{extra_offset, last_line_width, wrap_str, binary_search, first_line_width,
-            semicolon_for_stmt, trimmed_last_line_width, left_most_sub_expr, stmt_expr,
-            colon_spaces, contains_skip, mk_sp, last_line_extendable, paren_overhead};
+use utils::{
+    extra_offset,
+    last_line_width,
+    wrap_str,
+    binary_search,
+    first_line_width,
+    semicolon_for_stmt,
+    trimmed_last_line_width,
+    left_most_sub_expr,
+    stmt_expr,
+    colon_spaces,
+    contains_skip,
+    mk_sp,
+    last_line_extendable,
+    paren_overhead,
+};
 use visitor::FmtVisitor;
 use config::{Config, IndentStyle, MultilineStyle, ControlBraceStyle, Style};
 use comment::{FindUncommented, rewrite_comment, contains_comment, recover_comment_removed};

src/items.rs

@@ -12,13 +12,39 @@
 
 use {Indent, Shape, Spanned};
 use codemap::SpanUtils;
-use utils::{format_mutability, format_visibility, contains_skip, end_typaram, wrap_str,
-            last_line_width, format_unsafety, trim_newlines, stmt_expr, semicolon_for_expr,
-            trimmed_last_line_width, colon_spaces, mk_sp};
-use lists::{write_list, itemize_list, ListItem, ListFormatting, SeparatorTactic,
-            DefinitiveListTactic, ListTactic, definitive_tactic};
-use expr::{format_expr, is_empty_block, is_simple_block_stmt, rewrite_assign_rhs,
-           rewrite_call_inner, ExprType};
+use utils::{
+    format_mutability,
+    format_visibility,
+    contains_skip,
+    end_typaram,
+    wrap_str,
+    last_line_width,
+    format_unsafety,
+    trim_newlines,
+    stmt_expr,
+    semicolon_for_expr,
+    trimmed_last_line_width,
+    colon_spaces,
+    mk_sp,
+};
+use lists::{
+    write_list,
+    itemize_list,
+    ListItem,
+    ListFormatting,
+    SeparatorTactic,
+    DefinitiveListTactic,
+    ListTactic,
+    definitive_tactic,
+};
+use expr::{
+    format_expr,
+    is_empty_block,
+    is_simple_block_stmt,
+    rewrite_assign_rhs,
+    rewrite_call_inner,
+    ExprType,
+};
 use comment::{FindUncommented, contains_comment, rewrite_comment, recover_comment_removed};
 use visitor::FmtVisitor;
 use rewrite::{Rewrite, RewriteContext};

src/patterns.rs

@@ -12,10 +12,23 @@ use Shape;
 use codemap::SpanUtils;
 use rewrite::{Rewrite, RewriteContext};
 use utils::{wrap_str, format_mutability, mk_sp};
-use lists::{DefinitiveListTactic, SeparatorTactic, itemize_list, struct_lit_shape,
-            struct_lit_tactic, shape_for_tactic, struct_lit_formatting, write_list};
-use expr::{rewrite_call_inner, rewrite_unary_prefix, rewrite_pair, can_be_overflowed_expr,
-           wrap_struct_field};
+use lists::{
+    DefinitiveListTactic,
+    SeparatorTactic,
+    itemize_list,
+    struct_lit_shape,
+    struct_lit_tactic,
+    shape_for_tactic,
+    struct_lit_formatting,
+    write_list,
+};
+use expr::{
+    rewrite_call_inner,
+    rewrite_unary_prefix,
+    rewrite_pair,
+    can_be_overflowed_expr,
+    wrap_struct_field,
+};
 use types::{rewrite_path, PathContext};
 use super::Spanned;
 use comment::FindUncommented;

src/types.rs

@@ -20,8 +20,14 @@ use syntax::symbol::keywords;
 use {Shape, Spanned};
 use codemap::SpanUtils;
 use items::{format_generics_item_list, generics_shape_from_config};
-use lists::{write_list, itemize_list, ListFormatting, SeparatorTactic, ListTactic,
-            definitive_tactic};
+use lists::{
+    write_list,
+    itemize_list,
+    ListFormatting,
+    SeparatorTactic,
+    ListTactic,
+    definitive_tactic,
+};
 use rewrite::{Rewrite, RewriteContext};
 use utils::{extra_offset, format_mutability, colon_spaces, wrap_str, mk_sp, last_line_width};
 use expr::{rewrite_unary_prefix, rewrite_pair, rewrite_tuple, wrap_args_with_parens};

src/utils.rs

@@ -11,8 +11,16 @@
 use std::borrow::Cow;
 use std::cmp::Ordering;
 
-use syntax::ast::{self, Visibility, Attribute, MetaItem, MetaItemKind, NestedMetaItem,
-                  NestedMetaItemKind, Path};
+use syntax::ast::{
+    self,
+    Visibility,
+    Attribute,
+    MetaItem,
+    MetaItemKind,
+    NestedMetaItem,
+    NestedMetaItemKind,
+    Path,
+};
 use syntax::codemap::{BytePos, Span, NO_EXPANSION};
 use syntax::abi;
 

src/visitor.rs

@@ -25,8 +25,14 @@ use config::Config;
 use rewrite::{Rewrite, RewriteContext};
 use comment::rewrite_comment;
 use macros::{rewrite_macro, MacroPosition};
-use items::{rewrite_static, rewrite_associated_type, rewrite_associated_impl_type,
-            rewrite_type_alias, format_impl, format_trait};
+use items::{
+    rewrite_static,
+    rewrite_associated_type,
+    rewrite_associated_impl_type,
+    rewrite_type_alias,
+    format_impl,
+    format_trait,
+};
 use lists::{itemize_list, write_list, DefinitiveListTactic, ListFormatting, SeparatorTactic};
 
 fn is_use_item(item: &ast::Item) -> bool {

tests/target/import-fencepost-length.rs

@@ -1,4 +1,7 @@
 use aaaaaaaaaaaaaaa::bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb;
 use aaaaaaaaaaaaaaa::{bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccccccccccccc, dddddddd};
-use aaaaaaaaaaaaaaa::{bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccccccccccccc,
-                      ddddddddd};
+use aaaaaaaaaaaaaaa::{
+    bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
+    ccccccccccccccccccccccccccccccc,
+    ddddddddd,
+};

tests/target/imports-reorder.rs

@@ -1,6 +1,12 @@
 // rustfmt-normalize_comments: true
 // rustfmt-reorder_imported_names: true
 
-use path::{self /* self */, /* A */ A, B /* B */, C};
+use path::{
+    self, // self
+    // A
+    A,
+    B, // B
+    C,
+};
 
 use {Z, aa, ab, ac, b};

tests/target/imports.rs

@@ -5,22 +5,36 @@
 
 // Long import.
 use syntax::ast::{ItemForeignMod, ItemImpl, ItemMac, ItemMod, ItemStatic, ItemDefaultImpl};
-use exceedingly::looooooooooooooooooooooooooooooooooooooooooooooooooooooooooong::import::path::{ItemA,
-                                                                                                ItemB};
-use exceedingly::loooooooooooooooooooooooooooooooooooooooooooooooooooooooong::import::path::{ItemA,
-                                                                                             ItemB};
+use exceedingly::looooooooooooooooooooooooooooooooooooooooooooooooooooooooooong::import::path::{
+    ItemA,
+    ItemB,
+};
+use exceedingly::loooooooooooooooooooooooooooooooooooooooooooooooooooooooong::import::path::{
+    ItemA,
+    ItemB,
+};
 
-use list::{// Some item
-           SomeItem, // Comment
-           // Another item
-           AnotherItem, // Another Comment
-           // Last Item
-           LastItem};
+use list::{
+    // Some item
+    SomeItem, // Comment
+    // Another item
+    AnotherItem, // Another Comment
+    // Last Item
+    LastItem,
+};
 
-use test::{/* A */ self /* B */, Other /* C */};
+use test::{
+    // A
+    self,  // B
+    Other, // C
+};
 
 use syntax;
-use {/* Pre-comment! */ Foo, Bar /* comment */};
+use {
+    // Pre-comment!
+    Foo,
+    Bar, // comment
+};
 use Foo::{Bar, Baz};
 pub use syntax::ast::{Expr_, Expr, ExprAssign, ExprCall, ExprMethodCall, ExprPath};
 
@@ -32,8 +46,15 @@ mod Foo {
     pub use syntax::ast::{ItemForeignMod, ItemImpl, ItemMac, ItemMod, ItemStatic, ItemDefaultImpl};
 
     mod Foo2 {
-        pub use syntax::ast::{self, ItemForeignMod, ItemImpl, ItemMac, ItemMod, ItemStatic,
-                              ItemDefaultImpl};
+        pub use syntax::ast::{
+            self,
+            ItemForeignMod,
+            ItemImpl,
+            ItemMac,
+            ItemMod,
+            ItemStatic,
+            ItemDefaultImpl,
+        };
     }
 }
 

tests/target/multiple.rs

@@ -17,9 +17,42 @@ extern crate foo;
 extern crate foo;
 
 use std::cell::*;
-use std::{self, any, ascii, borrow, boxed, char, borrow, boxed, char, borrow, borrow, boxed, char,
-          borrow, boxed, char, borrow, boxed, char, borrow, boxed, char, borrow, boxed, char,
-          borrow, boxed, char, borrow, boxed, char, borrow, boxed, char};
+use std::{
+    self,
+    any,
+    ascii,
+    borrow,
+    boxed,
+    char,
+    borrow,
+    boxed,
+    char,
+    borrow,
+    borrow,
+    boxed,
+    char,
+    borrow,
+    boxed,
+    char,
+    borrow,
+    boxed,
+    char,
+    borrow,
+    boxed,
+    char,
+    borrow,
+    boxed,
+    char,
+    borrow,
+    boxed,
+    char,
+    borrow,
+    boxed,
+    char,
+    borrow,
+    boxed,
+    char,
+};
 
 mod doc;
 mod other;