From a76d9b529a75780690aa0978471f18da81676dd4 Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Mon, 12 Mar 2018 17:24:04 +1300 Subject: [PATCH] format code and tests --- bootstrap.sh | 5 ++--- src/bin/main.rs | 2 +- src/codemap.rs | 2 +- src/config/license.rs | 2 +- src/config/mod.rs | 4 ++-- src/config/summary.rs | 2 +- src/items.rs | 2 +- src/overflow.rs | 2 +- src/rustfmt_diff.rs | 2 +- tests/target/extern.rs | 13 +++++-------- tests/target/import-fencepost-length.rs | 2 +- tests/target/imports.rs | 8 ++++---- tests/target/skip.rs | 2 +- 13 files changed, 22 insertions(+), 26 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index d3878d9d61c..ae37b043c05 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -7,9 +7,8 @@ cargo build --release target/release/rustfmt --write-mode=overwrite src/lib.rs -target/release/rustfmt --write-mode=overwrite src/bin/rustfmt.rs -target/release/rustfmt --write-mode=overwrite src/bin/cargo-fmt.rs -target/release/rustfmt --write-mode=overwrite tests/system.rs +target/release/rustfmt --write-mode=overwrite src/bin/main.rs +target/release/rustfmt --write-mode=overwrite src/cargo-fmt/main.rs for filename in tests/target/*.rs; do if ! grep -q "rustfmt-" "$filename"; then diff --git a/src/bin/main.rs b/src/bin/main.rs index c89c25a90fe..914b2cee1af 100644 --- a/src/bin/main.rs +++ b/src/bin/main.rs @@ -22,9 +22,9 @@ use std::str::FromStr; use getopts::{Matches, Options}; +use rustfmt::{run, FileName, Input, Summary}; use rustfmt::config::{get_toml_path, Color, Config, WriteMode}; use rustfmt::config::file_lines::FileLines; -use rustfmt::{run, FileName, Input, Summary}; type FmtError = Box; type FmtResult = std::result::Result; diff --git a/src/codemap.rs b/src/codemap.rs index f6c05f5be40..c5f24004fcf 100644 --- a/src/codemap.rs +++ b/src/codemap.rs @@ -12,8 +12,8 @@ //! This includes extension traits and methods for looking up spans and line ranges for AST nodes. use config::file_lines::LineRange; -use visitor::SnippetProvider; use syntax::codemap::{BytePos, CodeMap, Span}; +use visitor::SnippetProvider; use comment::FindUncommented; diff --git a/src/config/license.rs b/src/config/license.rs index b2babd5ac19..d49fdbe7eba 100644 --- a/src/config/license.rs +++ b/src/config/license.rs @@ -1,6 +1,6 @@ -use std::io; use std::fmt; use std::fs::File; +use std::io; use std::io::Read; use regex; diff --git a/src/config/mod.rs b/src/config/mod.rs index 8af2814ec21..056cd26151f 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -23,9 +23,9 @@ mod config_type; mod options; pub mod file_lines; +pub mod license; pub mod lists; pub mod summary; -pub mod license; use config::config_type::ConfigType; use config::file_lines::FileLines; @@ -69,7 +69,7 @@ create_config! { // Ordering reorder_extern_crates: bool, true, false, "Reorder extern crate statements alphabetically"; - reorder_extern_crates_in_group: bool, true, false, "Reorder extern crate statements in group"; + reorder_extern_crates_in_group: bool, false, false, "Reorder extern crate statements in group"; reorder_imports: bool, true, false, "Reorder import statements alphabetically"; reorder_imports_in_group: bool, true, false, "Reorder import statements in group"; reorder_imported_names: bool, true, false, diff --git a/src/config/summary.rs b/src/config/summary.rs index b0be5678a0b..99bf752f2b9 100644 --- a/src/config/summary.rs +++ b/src/config/summary.rs @@ -8,8 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::time::{Duration, Instant}; use std::default::Default; +use std::time::{Duration, Instant}; #[must_use] #[derive(Debug, Default, Clone, Copy)] diff --git a/src/items.rs b/src/items.rs index 6306767f00c..273e5b36d6f 100644 --- a/src/items.rs +++ b/src/items.rs @@ -26,8 +26,8 @@ use config::{BraceStyle, Config, Density, IndentStyle}; use expr::{format_expr, is_empty_block, is_simple_block_stmt, rewrite_assign_rhs, rewrite_assign_rhs_with, ExprType, RhsTactics}; use lists::{definitive_tactic, itemize_list, write_list, ListFormatting, ListItem, Separator}; -use rewrite::{Rewrite, RewriteContext}; use overflow; +use rewrite::{Rewrite, RewriteContext}; use shape::{Indent, Shape}; use spanned::Spanned; use types::TraitTyParamBounds; diff --git a/src/overflow.rs b/src/overflow.rs index 294c257d31f..c76b67c461e 100644 --- a/src/overflow.rs +++ b/src/overflow.rs @@ -17,9 +17,9 @@ use syntax::codemap::Span; use closures; use codemap::SpanUtils; +use expr::{is_nested_call, maybe_get_args_offset, ToExpr}; use lists::{definitive_tactic, itemize_list, write_list, ListFormatting, ListItem, Separator}; use rewrite::{Rewrite, RewriteContext}; -use expr::{is_nested_call, maybe_get_args_offset, ToExpr}; use shape::Shape; use spanned::Spanned; use utils::{count_newlines, extra_offset, first_line_width, last_line_width, mk_sp, paren_overhead}; diff --git a/src/rustfmt_diff.rs b/src/rustfmt_diff.rs index f9919157620..ca847656562 100644 --- a/src/rustfmt_diff.rs +++ b/src/rustfmt_diff.rs @@ -12,8 +12,8 @@ use config::Color; use diff; use std::collections::VecDeque; use std::io; -use term; use std::io::Write; +use term; use utils::use_colored_tty; #[derive(Debug, PartialEq)] diff --git a/tests/target/extern.rs b/tests/target/extern.rs index b0aa51127d5..61989cace75 100644 --- a/tests/target/extern.rs +++ b/tests/target/extern.rs @@ -1,17 +1,14 @@ // rustfmt-normalize_comments: true -extern crate foo; -extern crate foo as bar; - +extern crate bar; extern crate chrono; extern crate dotenv; -extern crate futures; - -extern crate bar; extern crate foo; - -// #2315 +extern crate foo; +extern crate foo as bar; +extern crate futures; extern crate proc_macro; +// #2315 extern crate proc_macro2; extern "C" { diff --git a/tests/target/import-fencepost-length.rs b/tests/target/import-fencepost-length.rs index e4f885c09b1..9d247aaf6df 100644 --- a/tests/target/import-fencepost-length.rs +++ b/tests/target/import-fencepost-length.rs @@ -1,4 +1,4 @@ -use aaaaaaaaaaaaaaa::bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb; use aaaaaaaaaaaaaaa::{bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccccccccccccc, dddddddd}; use aaaaaaaaaaaaaaa::{bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccccccccccccc, ddddddddd}; +use aaaaaaaaaaaaaaa::bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb; diff --git a/tests/target/imports.rs b/tests/target/imports.rs index 2b825526199..34573b48937 100644 --- a/tests/target/imports.rs +++ b/tests/target/imports.rs @@ -4,11 +4,11 @@ // Imports. // Long import. -use syntax::ast::{ItemDefaultImpl, ItemForeignMod, ItemImpl, ItemMac, ItemMod, ItemStatic}; -use exceedingly::looooooooooooooooooooooooooooooooooooooooooooooooooooooooooong::import::path::{ItemA, - ItemB}; use exceedingly::loooooooooooooooooooooooooooooooooooooooooooooooooooooooong::import::path::{ItemA, ItemB}; +use exceedingly::looooooooooooooooooooooooooooooooooooooooooooooooooooooooooong::import::path::{ItemA, + ItemB}; +use syntax::ast::{ItemDefaultImpl, ItemForeignMod, ItemImpl, ItemMac, ItemMod, ItemStatic}; use list::{// Another item AnotherItem, // Another Comment @@ -19,9 +19,9 @@ use list::{// Another item use test::{/* A */ self /* B */, Other /* C */}; -use syntax; use {Bar /* comment */, /* Pre-comment! */ Foo}; use Foo::{Bar, Baz}; +use syntax; pub use syntax::ast::{Expr, ExprAssign, ExprCall, ExprMethodCall, ExprPath, Expr_}; use self; diff --git a/tests/target/skip.rs b/tests/target/skip.rs index 28897ade56f..11d1d69e91a 100644 --- a/tests/target/skip.rs +++ b/tests/target/skip.rs @@ -59,7 +59,7 @@ fn skip_on_statements() { // Item #[cfg_attr(rustfmt, rustfmt_skip)] - use foobar ; + use foobar; // Mac #[cfg_attr(rustfmt, rustfmt_skip)]