Tidy up and pass tests

[rust.git] / tests / target / imports.rs

diff --git a/tests/target/imports.rs b/tests/target/imports.rs
index 32f76b29b58265340c45403f2671afb4b60575c4..2b8255261990dd43764e18d1015641332809a403 100644 (file)
--- a/tests/target/imports.rs
+++ b/tests/target/imports.rs
@@ -4,36 +4,36 @@
 // Imports.
 
 // Long import.
-use syntax::ast::{ItemForeignMod, ItemImpl, ItemMac, ItemMod, ItemStatic, ItemDefaultImpl};
+use syntax::ast::{ItemDefaultImpl, ItemForeignMod, ItemImpl, ItemMac, ItemMod, ItemStatic};
 use exceedingly::looooooooooooooooooooooooooooooooooooooooooooooooooooooooooong::import::path::{ItemA,
                                                                                                 ItemB};
 use exceedingly::loooooooooooooooooooooooooooooooooooooooooooooooooooooooong::import::path::{ItemA,
                                                                                              ItemB};
 
-use list::{// Some item
-           SomeItem, // Comment
-           // Another item
+use list::{// Another item
            AnotherItem, // Another Comment
            // Last Item
-           LastItem};
+           LastItem,
+           // Some item
+           SomeItem /* Comment */};
 
 use test::{/* A */ self /* B */, Other /* C */};
 
 use syntax;
-use {/* Pre-comment! */ Foo, Bar /* comment */};
+use {Bar /* comment */, /* Pre-comment! */ Foo};
 use Foo::{Bar, Baz};
-pub use syntax::ast::{Expr_, Expr, ExprAssign, ExprCall, ExprMethodCall, ExprPath};
+pub use syntax::ast::{Expr, ExprAssign, ExprCall, ExprMethodCall, ExprPath, Expr_};
 
 use self;
 use std::io;
 use std::io;
 
 mod Foo {
-    pub use syntax::ast::{ItemForeignMod, ItemImpl, ItemMac, ItemMod, ItemStatic, ItemDefaultImpl};
+    pub use syntax::ast::{ItemDefaultImpl, ItemForeignMod, ItemImpl, ItemMac, ItemMod, ItemStatic};
 
     mod Foo2 {
-        pub use syntax::ast::{self, ItemForeignMod, ItemImpl, ItemMac, ItemMod, ItemStatic,
-                              ItemDefaultImpl};
+        pub use syntax::ast::{self, ItemDefaultImpl, ItemForeignMod, ItemImpl, ItemMac, ItemMod,
+                              ItemStatic};
     }
 }
 
@@ -67,3 +67,22 @@ fn test() {
 // spaces used to cause glob imports to disappear (#1356)
 use super::*;
 use foo::issue_1356::*;
+
+// We shouldn't remove imports which have attributes attached (#1858)
+#[cfg(unix)]
+use self::unix::{};
+
+// nested imports
+use foo::{a, b, boo, c,
+          bar::{baz, qux, xxxxxxxxxxx, yyyyyyyyyyyyy, zzzzzzzzzzzzzzzz,
+                foo::{a, b, cxxxxxxxxxxxxx, yyyyyyyyyyyyyy, zzzzzzzzzzzzzzzz}}};
+
+use fooo::{bar, x, y, z,
+           baar::foobar::{xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx, yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy,
+                          zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz},
+           bar::*};
+
+// nested imports with a single sub-tree.
+use a::b::c::*;
+use a::b::c::d;
+use a::b::c::{xxx, yyy, zzz};