diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2020-08-22 12:28:09 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2020-10-17 14:04:49 +0300 |
| commit | 3522add318f8fbcd96a032f6779be09ba3d80478 (patch) | |
| tree | 3c2b804d1e4086e90657935f1fd729f15ad961c4 | |
| parent | 03687f8ffaf5ff03f6bedbe77752b9f930c7efeb (diff) | |
| download | rust-3522add318f8fbcd96a032f6779be09ba3d80478.tar.gz rust-3522add318f8fbcd96a032f6779be09ba3d80478.zip | |
resolve: Do not put nonexistent crate `meta` into prelude
| -rw-r--r-- | compiler/rustc_resolve/src/lib.rs | 3 | ||||
| -rw-r--r-- | src/test/ui/rfc-2126-extern-absolute-paths/meta.rs | 7 | ||||
| -rw-r--r-- | src/test/ui/rfc-2126-extern-absolute-paths/meta.stderr | 9 |
3 files changed, 0 insertions, 19 deletions
diff --git a/compiler/rustc_resolve/src/lib.rs b/compiler/rustc_resolve/src/lib.rs index 6677a5ffe28..e7486db4deb 100644 --- a/compiler/rustc_resolve/src/lib.rs +++ b/compiler/rustc_resolve/src/lib.rs @@ -1240,9 +1240,6 @@ impl<'a> Resolver<'a> { 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 index 1fb5878ca2a..00000000000 --- a/src/test/ui/rfc-2126-extern-absolute-paths/meta.rs +++ /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 index eb4b9dea41b..00000000000 --- a/src/test/ui/rfc-2126-extern-absolute-paths/meta.stderr +++ /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`. |