user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update src/test/ui

Browse source
This commit is contained in:
mental 2020-01-02 08:38:59 +02:00
parent 72ee3622d7
commit 3323f1e57d
4 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/test/ui/dollar-crate/dollar-crate-is-keyword.rs
View file

@ -6,10 +6,8 @@ macro_rules! m {
struct $crate {} //~ ERROR expected identifier, found reserved identifier `$crate`
}
use $crate; // OK
//~^ WARN `$crate` may not be imported
use $crate; // ERROR `$crate` may not be imported
use $crate as $crate; //~ ERROR expected identifier, found reserved identifier `$crate`
//~^ WARN `$crate` may not be imported
}
}

16
src/test/ui/dollar-crate/dollar-crate-is-keyword.stderr
View file

@ -8,7 +8,7 @@ LL | m!();
| ----- in this macro invocation
error: expected identifier, found reserved identifier `$crate`
--> $DIR/dollar-crate-is-keyword.rs:11:23
--> $DIR/dollar-crate-is-keyword.rs:10:23
|
LL | use $crate as $crate;
| ^^^^^^ expected identifier, found reserved identifier
@ -16,27 +16,23 @@ LL | use $crate as $crate;
LL | m!();
| ----- in this macro invocation
warning: `$crate` may not be imported
error: `$crate` may not be imported
--> $DIR/dollar-crate-is-keyword.rs:9:9
|
LL | use $crate; // OK
LL | use $crate; // ERROR `$crate` may not be imported
| ^^^^^^^^^^^
...
LL | m!();
| ----- in this macro invocation
|
= note: `use $crate;` was erroneously allowed and will become a hard error in a future release
warning: `$crate` may not be imported
--> $DIR/dollar-crate-is-keyword.rs:11:9
error: `$crate` may not be imported
--> $DIR/dollar-crate-is-keyword.rs:10:9
|
LL | use $crate as $crate;
| ^^^^^^^^^^^^^^^^^^^^^
...
LL | m!();
| ----- in this macro invocation
|
= note: `use $crate;` was erroneously allowed and will become a hard error in a future release
error: aborting due to 2 previous errors
error: aborting due to 4 previous errors

3
src/test/ui/imports/import-crate-var.rs
View file

@ -5,6 +5,5 @@
fn main() {
m!();
//~^ WARN `$crate` may not be imported
//~| NOTE `use $crate;` was erroneously allowed and will become a hard error
//~^ ERROR `$crate` may not be imported
}

3
src/test/ui/imports/import-crate-var.stderr
View file

@ -1,9 +1,8 @@
warning: `$crate` may not be imported
error: `$crate` may not be imported
--> $DIR/import-crate-var.rs:7:5
|
LL | m!();
| ^^^^^
|
= note: `use $crate;` was erroneously allowed and will become a hard error in a future release
= note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)