From c0da63951afb127a898a503b5e80061f8aa93105 Mon Sep 17 00:00:00 2001 From: mental Date: Fri, 3 Jan 2020 11:50:12 +0200 Subject: [PATCH] Thank you Dylan and JohnTitor for blessing me. --- src/test/ui/dollar-crate/dollar-crate-is-keyword.rs | 1 + src/test/ui/dollar-crate/dollar-crate-is-keyword.stderr | 3 +-- src/test/ui/imports/import-crate-var.stderr | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/test/ui/dollar-crate/dollar-crate-is-keyword.rs b/src/test/ui/dollar-crate/dollar-crate-is-keyword.rs index e1a8eda948e..d625163dc7e 100644 --- a/src/test/ui/dollar-crate/dollar-crate-is-keyword.rs +++ b/src/test/ui/dollar-crate/dollar-crate-is-keyword.rs @@ -8,6 +8,7 @@ macro_rules! m { use $crate; //~ ERROR `$crate` may not be imported use $crate as $crate; //~ ERROR expected identifier, found reserved identifier `$crate` + //~^ ERROR `$crate` may not be imported } } diff --git a/src/test/ui/dollar-crate/dollar-crate-is-keyword.stderr b/src/test/ui/dollar-crate/dollar-crate-is-keyword.stderr index 6f3cf9a55c7..1efd3fa06a5 100644 --- a/src/test/ui/dollar-crate/dollar-crate-is-keyword.stderr +++ b/src/test/ui/dollar-crate/dollar-crate-is-keyword.stderr @@ -19,7 +19,7 @@ LL | m!(); error: `$crate` may not be imported --> $DIR/dollar-crate-is-keyword.rs:9:9 | -LL | use $crate; // ERROR `$crate` may not be imported +LL | use $crate; | ^^^^^^^^^^^ ... LL | m!(); @@ -35,4 +35,3 @@ LL | m!(); | ----- in this macro invocation error: aborting due to 4 previous errors - diff --git a/src/test/ui/imports/import-crate-var.stderr b/src/test/ui/imports/import-crate-var.stderr index 98f113fb455..4f98e973c52 100644 --- a/src/test/ui/imports/import-crate-var.stderr +++ b/src/test/ui/imports/import-crate-var.stderr @@ -1,8 +1,9 @@ error: `$crate` may not be imported - --> $DIR/import-crate-var.rs:7:5 + --> $DIR/import-crate-var.rs:6:5 | LL | m!(); | ^^^^^ | - = note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) + = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) +error: aborting due to previous error