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

Make warning an error; use help instead of suggestion; clean up code

Browse source 
For some reason, the help message is now in a separate message, which
adds a lot of noise. I would like to try to get it back to one message.
This commit is contained in:
Camelid 2020-06-14 13:38:09 -07:00
parent 7aaadb69e4
commit b94b7e7f1b
3 changed files with 88 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/test/ui/asm/duplicate-options.rs
View file

@ -1,19 +1,24 @@
// only-x86_64
// build-pass
#![feature(asm)]
fn main() {
unsafe {
asm!("", options(nomem, nomem));
//~^ WARNING the `nomem` option was already provided
//~^ ERROR the `nomem` option was already provided
//~| HELP remove this option
asm!("", options(att_syntax, att_syntax));
//~^ WARNING the `att_syntax` option was already provided
//~^ ERROR the `att_syntax` option was already provided
//~| HELP remove this option
asm!("", options(nostack, att_syntax), options(nostack));
//~^ WARNING the `nostack` option was already provided
//~^ ERROR the `nostack` option was already provided
//~| HELP remove this option
asm!("", options(nostack, nostack), options(nostack), options(nostack));
//~^ WARNING the `nostack` option was already provided
//~| WARNING the `nostack` option was already provided
//~| WARNING the `nostack` option was already provided
//~^ ERROR the `nostack` option was already provided
//~| HELP remove this option
//~| ERROR the `nostack` option was already provided
//~| HELP remove this option
//~| ERROR the `nostack` option was already provided
//~| HELP remove this option
}
}

74
src/test/ui/asm/duplicate-options.stderr
View file

@ -1,38 +1,74 @@
warning: the `nomem` option was already provided
--> $DIR/duplicate-options.rs:8:33
error: the `nomem` option was already provided
--> $DIR/duplicate-options.rs:7:33
|
LL | asm!("", options(nomem, nomem));
| ^^^^^ help: remove this option
| ^^^^^
|
help: remove this option
--> $DIR/duplicate-options.rs:7:33
|
LL | asm!("", options(nomem, nomem));
| ^^^^^
warning: the `att_syntax` option was already provided
error: the `att_syntax` option was already provided
--> $DIR/duplicate-options.rs:10:38
|
LL | asm!("", options(att_syntax, att_syntax));
| ^^^^^^^^^^ help: remove this option
| ^^^^^^^^^^
|
help: remove this option
--> $DIR/duplicate-options.rs:10:38
|
LL | asm!("", options(att_syntax, att_syntax));
| ^^^^^^^^^^
warning: the `nostack` option was already provided
--> $DIR/duplicate-options.rs:12:56
error: the `nostack` option was already provided
--> $DIR/duplicate-options.rs:13:56
|
LL | asm!("", options(nostack, att_syntax), options(nostack));
| ^^^^^^^ help: remove this option
| ^^^^^^^
|
help: remove this option
--> $DIR/duplicate-options.rs:13:56
|
LL | asm!("", options(nostack, att_syntax), options(nostack));
| ^^^^^^^
warning: the `nostack` option was already provided
--> $DIR/duplicate-options.rs:14:35
error: the `nostack` option was already provided
--> $DIR/duplicate-options.rs:16:35
|
LL | asm!("", options(nostack, nostack), options(nostack), options(nostack));
| ^^^^^^^ help: remove this option
warning: the `nostack` option was already provided
--> $DIR/duplicate-options.rs:14:53
| ^^^^^^^
|
help: remove this option
--> $DIR/duplicate-options.rs:16:35
|
LL | asm!("", options(nostack, nostack), options(nostack), options(nostack));
| ^^^^^^^ help: remove this option
| ^^^^^^^
warning: the `nostack` option was already provided
--> $DIR/duplicate-options.rs:14:71
error: the `nostack` option was already provided
--> $DIR/duplicate-options.rs:16:53
|
LL | asm!("", options(nostack, nostack), options(nostack), options(nostack));
| ^^^^^^^ help: remove this option
| ^^^^^^^
|
help: remove this option
--> $DIR/duplicate-options.rs:16:53
|
LL | asm!("", options(nostack, nostack), options(nostack), options(nostack));
| ^^^^^^^
warning: 6 warnings emitted
error: the `nostack` option was already provided
--> $DIR/duplicate-options.rs:16:71
|
LL | asm!("", options(nostack, nostack), options(nostack), options(nostack));
| ^^^^^^^
|
help: remove this option
--> $DIR/duplicate-options.rs:16:71
|
LL | asm!("", options(nostack, nostack), options(nostack), options(nostack));
| ^^^^^^^
error: aborting due to 6 previous errors