Merge pull request rust-lang#2535 from nrc/import-ord

Import ordering

Author: nrc

Configurations.md

@@ -1297,28 +1297,28 @@ Reorder import statements in group
 
 **Note:** This option takes effect only when [`reorder_imports`](#reorder_imports) is set to `true`.
 
-#### `false` (default):
+#### `true` (default):
 
 ```rust
-use std::mem;
 use std::io;
+use std::mem;
 
-use lorem;
-use ipsum;
 use dolor;
+use ipsum;
+use lorem;
 use sit;
 ```
 
-#### `true`:
+#### `false`:
 
-```rust
-use std::io;
-use std::mem;
 
+```rust
 use dolor;
 use ipsum;
 use lorem;
 use sit;
+use std::io;
+use std::mem;
 ```
 
 See also [`reorder_imports`](#reorder_imports).
@@ -1360,7 +1360,11 @@ Reorder `extern crate` statements in group
 - **Possible values**: `true`, `false`
 - **Stable**: No
 
-#### `true` (default):
+#### `false` (default):
+
+This value has no influence beyond the effect of the [`reorder_extern_crates`](#reorder_extern_crates) option. Set [`reorder_extern_crates`](#reorder_extern_crates) to `false` if you do not want `extern crate` groups to be collapsed and ordered.
+
+#### `true`:
 
 **Note:** This only takes effect when [`reorder_extern_crates`](#reorder_extern_crates) is set to `true`.
 
@@ -1374,10 +1378,6 @@ extern crate lorem;
 extern crate sit;
 ```
 
-#### `false`:
-
-This value has no influence beyond the effect of the [`reorder_extern_crates`](#reorder_extern_crates) option. Set [`reorder_extern_crates`](#reorder_extern_crates) to `false` if you do not want `extern crate` groups to be collapsed and ordered.
-
 ## `reorder_modules`
 
 Reorder `mod` declarations alphabetically in group.
@@ -1386,7 +1386,7 @@ Reorder `mod` declarations alphabetically in group.
 - **Possible values**: `true`, `false`
 - **Stable**: No
 
-#### `true`
+#### `true` (default)
 
 ```rust
 mod a;

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

src/bin/main.rs

@@ -14,16 +14,16 @@ extern crate env_logger;
 extern crate getopts;
 extern crate rustfmt_nightly as rustfmt;
 
-use std::{env, error};
 use std::fs::File;
 use std::io::{self, Read, Write};
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
+use std::{env, error};
 
 use getopts::{Matches, Options};
 
-use rustfmt::config::{get_toml_path, Color, Config, WriteMode};
 use rustfmt::config::file_lines::FileLines;
+use rustfmt::config::{get_toml_path, Color, Config, WriteMode};
 use rustfmt::{run, FileName, Input, Summary};
 
 type FmtError = Box<error::Error + Send + Sync>;

src/chains.rs

@@ -77,8 +77,8 @@ use std::borrow::Cow;
 use std::cmp::min;
 use std::iter;
 
-use syntax::{ast, ptr};
 use syntax::codemap::Span;
+use syntax::{ast, ptr};
 
 pub fn rewrite_chain(expr: &ast::Expr, context: &RewriteContext, shape: Shape) -> Option<String> {
     debug!("rewrite_chain {:?}", shape);

src/closures.rs

@@ -9,9 +9,9 @@
 // except according to those terms.
 
 use config::lists::*;
-use syntax::{ast, ptr};
 use syntax::codemap::Span;
 use syntax::parse::classify;
+use syntax::{ast, ptr};
 
 use codemap::SpanUtils;
 use expr::{block_contains_comment, is_simple_block, is_unsafe_block, rewrite_cond, ToExpr};

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;
 

src/config/file_lines.rs

@@ -10,9 +10,9 @@
 
 //! This module contains types and functions to support formatting specific line ranges.
 
-use std::{cmp, iter, str};
 use std::collections::HashMap;
 use std::rc::Rc;
+use std::{cmp, iter, str};
 
 use serde::de::{Deserialize, Deserializer};
 use serde_json as json;

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;

src/config/mod.rs

@@ -8,12 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::{env, fs};
 use std::cell::Cell;
 use std::default::Default;
 use std::fs::File;
 use std::io::{Error, ErrorKind, Read};
 use std::path::{Path, PathBuf};
+use std::{env, fs};
 
 use regex::Regex;
 
@@ -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;
@@ -70,11 +70,11 @@ 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_imports: bool, false, false, "Reorder import statements alphabetically";
-    reorder_imports_in_group: bool, false, false, "Reorder import 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,
         "Reorder lists of names in import statements alphabetically";
-    reorder_modules: bool, false, false, "Reorder module statemtents alphabetically in group";
+    reorder_modules: bool, true, false, "Reorder module statemtents alphabetically in group";
 
     // Spaces around punctuation
     binop_separator: SeparatorPlace, SeparatorPlace::Front, false,

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)]