Format source codes and update tests

diff --git a/src/bin/rustfmt.rs b/src/bin/rustfmt.rs
index 2de572f616e9b1d2bbd10b65d7734c933fd6fb2e..d1f7a83187b3d495fe11a759162ed6c152fc62a0 100644 (file)
--- a/src/bin/rustfmt.rs
+++ b/src/bin/rustfmt.rs
@@ -11,11 +11,11 @@
 #![cfg(not(test))]
 
 
+extern crate env_logger;
+extern crate getopts;
 extern crate log;
 extern crate rustfmt_nightly as rustfmt;
 extern crate toml;
-extern crate env_logger;
-extern crate getopts;
 
 use std::{env, error};
 use std::fs::File;

diff --git a/src/lib.rs b/src/lib.rs
index e1017fab9596ea51e4e8afd6758dcac840d44e91..eaac371aa5b6b9f892756c8394633159cb4adb64 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -10,23 +10,19 @@
 
 #![feature(rustc_private)]
 
+extern crate diff;
 #[macro_use]
 extern crate log;
-
+extern crate regex;
+extern crate rustc_errors as errors;
 extern crate serde;
 #[macro_use]
 extern crate serde_derive;
 extern crate serde_json;
-
-extern crate syntax;
-extern crate rustc_errors as errors;
-
 extern crate strings;
-
-extern crate unicode_segmentation;
-extern crate regex;
-extern crate diff;
+extern crate syntax;
 extern crate term;
+extern crate unicode_segmentation;
 
 use std::collections::HashMap;
 use std::fmt;

diff --git a/tests/source/extern.rs b/tests/source/extern.rs
index 7f14d27b779e626fe54e9dec1a95a5f72aea6848..5546b2172266777eab4d8945c806d4e072d55512 100644 (file)
--- a/tests/source/extern.rs
+++ b/tests/source/extern.rs
@@ -3,6 +3,13 @@
  extern crate       foo    ;   
     extern crate       foo       as bar    ;   
 
+extern crate futures;
+extern crate dotenv;
+extern crate chrono;
+
+extern crate foo;
+extern crate bar;
+
  extern  "C" {
   fn c_func(x: *mut *mut libc::c_void);
 

diff --git a/tests/system.rs b/tests/system.rs
index d915e11d534db590822f1452da96b7c2bde33ee5..6e148147a48885e9226a04790b8e3ea143a9c714 100644 (file)
--- a/tests/system.rs
+++ b/tests/system.rs
@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate rustfmt_nightly as rustfmt;
 extern crate diff;
 extern crate regex;
+extern crate rustfmt_nightly as rustfmt;
 extern crate term;
 
 use std::collections::HashMap;

diff --git a/tests/target/attrib-extern-crate.rs b/tests/target/attrib-extern-crate.rs
index fe06195b154d3ad10fce6a766f35eaa7bd9aee88..ed64a0aeb0710110b5819d5b629dbf00bf2abc4c 100644 (file)
--- a/tests/target/attrib-extern-crate.rs
+++ b/tests/target/attrib-extern-crate.rs
@@ -1,17 +1,17 @@
 // Attributes on extern crate.
 
-extern crate Foo;
 #[Attr1]
 extern crate Bar;
 #[Attr2]
 #[Attr2]
 extern crate Baz;
+extern crate Foo;
 
 fn foo() {
-    extern crate Foo;
     #[Attr1]
     extern crate Bar;
     #[Attr2]
     #[Attr2]
     extern crate Baz;
+    extern crate Foo;
 }

diff --git a/tests/target/extern.rs b/tests/target/extern.rs
index 1431c384db98dea8e31509989bcb248105af4752..c0601a4d0e1c3e01a862f2f5e1a8f39e1f3420a3 100644 (file)
--- a/tests/target/extern.rs
+++ b/tests/target/extern.rs
@@ -1,7 +1,14 @@
 // rustfmt-normalize_comments: true
 
-extern crate foo;
 extern crate foo as bar;
+extern crate foo;
+
+extern crate chrono;
+extern crate dotenv;
+extern crate futures;
+
+extern crate bar;
+extern crate foo;
 
 extern "C" {
     fn c_func(x: *mut *mut libc::c_void);