]> git.lizzy.rs Git - rust.git/commitdiff
resolve: Do not put nonexistent crate `meta` into prelude
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>
Sat, 22 Aug 2020 09:28:09 +0000 (12:28 +0300)
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>
Sat, 17 Oct 2020 11:04:49 +0000 (14:04 +0300)
compiler/rustc_resolve/src/lib.rs
src/test/ui/rfc-2126-extern-absolute-paths/meta.rs [deleted file]
src/test/ui/rfc-2126-extern-absolute-paths/meta.stderr [deleted file]

index 6677a5ffe2867e3218078ae027725a2e2e83a19a..e7486db4debcc0047fdd284ab6d5510f9d8941c0 100644 (file)
@@ -1240,9 +1240,6 @@ pub fn new(
             extern_prelude.insert(Ident::with_dummy_span(sym::core), Default::default());
             if !session.contains_name(&krate.attrs, sym::no_std) {
                 extern_prelude.insert(Ident::with_dummy_span(sym::std), Default::default());
-                if session.rust_2018() {
-                    extern_prelude.insert(Ident::with_dummy_span(sym::meta), Default::default());
-                }
             }
         }
 
diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/meta.rs b/src/test/ui/rfc-2126-extern-absolute-paths/meta.rs
deleted file mode 100644 (file)
index 1fb5878..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-// edition:2018
-
-// Tests that `meta` is allowed, even if the crate doesn't exist
-// yet (i.e., it causes a different error than `not-allowed.rs`).
-use meta; //~ ERROR can't find crate for `meta`
-
-fn main() {}
diff --git a/src/test/ui/rfc-2126-extern-absolute-paths/meta.stderr b/src/test/ui/rfc-2126-extern-absolute-paths/meta.stderr
deleted file mode 100644 (file)
index eb4b9de..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-error[E0463]: can't find crate for `meta`
-  --> $DIR/meta.rs:5:5
-   |
-LL | use meta;
-   |     ^^^^ can't find crate
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0463`.