resolve: Resolve single-segment imports using in-scope resolution on 2018 edition

3 files changed, 15 insertions, 3 deletions

diff --git a/src/test/ui/feature-gates/feature-gate-extern_crate_item_prelude.rs b/src/test/ui/feature-gates/feature-gate-extern_crate_item_prelude.rs
index a043b6c2e61..27b9a34ff4e 100644
--- a/src/test/ui/feature-gates/feature-gate-extern_crate_item_prelude.rs
+++ b/src/test/ui/feature-gates/feature-gate-extern_crate_item_prelude.rs
@@ -1,6 +1,6 @@
 // edition:2018
 
-#![feature(alloc)]
+#![feature(alloc, underscore_imports)]
 
 extern crate alloc;
 
@@ -23,7 +23,7 @@ mod absolute {
 }
 
 mod import_in_scope {
-    use alloc;
+    use alloc as _;
     //~^ ERROR use of extern prelude names introduced with `extern crate` items is unstable
     use alloc::boxed;
     //~^ ERROR use of extern prelude names introduced with `extern crate` items is unstable
diff --git a/src/test/ui/feature-gates/feature-gate-extern_crate_item_prelude.stderr b/src/test/ui/feature-gates/feature-gate-extern_crate_item_prelude.stderr
index bbd4b630263..103ab79ef84 100644
--- a/src/test/ui/feature-gates/feature-gate-extern_crate_item_prelude.stderr
+++ b/src/test/ui/feature-gates/feature-gate-extern_crate_item_prelude.stderr
@@ -1,7 +1,7 @@
 error[E0658]: use of extern prelude names introduced with `extern crate` items is unstable (see issue #55599)
   --> $DIR/feature-gate-extern_crate_item_prelude.rs:26:9
    |
-LL |     use alloc;
+LL |     use alloc as _;
    |         ^^^^^
    |
    = help: add #![feature(extern_crate_item_prelude)] to the crate attributes to enable
diff --git a/src/test/ui/rust-2018/uniform-paths/from-decl-macro.rs b/src/test/ui/rust-2018/uniform-paths/from-decl-macro.rs
new file mode 100644
index 00000000000..5c3c753f9a7
--- /dev/null
+++ b/src/test/ui/rust-2018/uniform-paths/from-decl-macro.rs
@@ -0,0 +1,12 @@
+// compile-pass
+// edition:2018
+
+#![feature(decl_macro)]
+
+macro check() {
+    ::std::vec::Vec::<u8>::new()
+}
+
+fn main() {
+    check!();
+}