Auto merge of #50665 - alexcrichton:fix-single-item-path-warnings, r=oli-obk

[rust.git] / src / test / ui / edition-lint-paths.rs

diff --git a/src/test/ui/edition-lint-paths.rs b/src/test/ui/edition-lint-paths.rs
index 0b49e72ccd94c4d57279a657eb799cdcd1b36475..6cc3295a4d95bbb9988e09662d47952cb0a08435 100644 (file)
--- a/src/test/ui/edition-lint-paths.rs
+++ b/src/test/ui/edition-lint-paths.rs
@@ -8,34 +8,70 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#![feature(crate_in_paths)]
-#![deny(absolute_path_starting_with_module)]
+// aux-build:edition-lint-paths.rs
+// run-rustfix
+
+#![feature(rust_2018_preview)]
+#![deny(absolute_path_not_starting_with_crate)]
 #![allow(unused)]
 
+extern crate edition_lint_paths;
+
 pub mod foo {
+    use edition_lint_paths;
     use ::bar::Bar;
-    //~^ ERROR Absolute
+    //~^ ERROR absolute
     //~| WARN this was previously accepted
     use super::bar::Bar2;
     use crate::bar::Bar3;
-}
 
+    use bar;
+    //~^ ERROR absolute
+    //~| WARN this was previously accepted
+    use crate::{bar as something_else};
+
+    use {Bar as SomethingElse, main};
+    //~^ ERROR absolute
+    //~| WARN this was previously accepted
+    //~| ERROR absolute
+    //~| WARN this was previously accepted
+
+    use crate::{Bar as SomethingElse2, main as another_main};
+
+    pub fn test() {
+    }
+}
 
 use bar::Bar;
-//~^ ERROR Absolute
+//~^ ERROR absolute
 //~| WARN this was previously accepted
 
 pub mod bar {
+    use edition_lint_paths as foo;
     pub struct Bar;
     pub type Bar2 = Bar;
     pub type Bar3 = Bar;
 }
 
+mod baz {
+    use *;
+    //~^ ERROR absolute
+    //~| WARN this was previously accepted
+}
+
 fn main() {
     let x = ::bar::Bar;
-    //~^ ERROR Absolute
+    //~^ ERROR absolute
     //~| WARN this was previously accepted
     let x = bar::Bar;
     let x = ::crate::bar::Bar;
     let x = self::bar::Bar;
+    foo::test();
+
+    {
+        use edition_lint_paths as bar;
+        edition_lint_paths::foo();
+        bar::foo();
+        ::edition_lint_paths::foo();
+    }
 }