From 7c5b66f3287c95df7e1aaca1d2a0576eed69f7dd Mon Sep 17 00:00:00 2001 From: Camelid Date: Mon, 15 Jun 2020 12:11:49 -0700 Subject: [PATCH] Update duplicate options test --- src/test/ui/asm/duplicate-options.rs | 6 --- src/test/ui/asm/duplicate-options.stderr | 58 +++++------------------- 2 files changed, 11 insertions(+), 53 deletions(-) diff --git a/src/test/ui/asm/duplicate-options.rs b/src/test/ui/asm/duplicate-options.rs index e412932fa7eb..1df7f55f8124 100644 --- a/src/test/ui/asm/duplicate-options.rs +++ b/src/test/ui/asm/duplicate-options.rs @@ -6,19 +6,13 @@ fn main() { unsafe { asm!("", options(nomem, nomem)); //~^ ERROR the `nomem` option was already provided - //~| HELP remove this option asm!("", options(att_syntax, att_syntax)); //~^ ERROR the `att_syntax` option was already provided - //~| HELP remove this option asm!("", options(nostack, att_syntax), options(nostack)); //~^ ERROR the `nostack` option was already provided - //~| HELP remove this option asm!("", options(nostack, nostack), options(nostack), options(nostack)); //~^ 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 } } diff --git a/src/test/ui/asm/duplicate-options.stderr b/src/test/ui/asm/duplicate-options.stderr index accfdef474bb..6339ae9db810 100644 --- a/src/test/ui/asm/duplicate-options.stderr +++ b/src/test/ui/asm/duplicate-options.stderr @@ -2,73 +2,37 @@ error: the `nomem` option was already provided --> $DIR/duplicate-options.rs:7:33 | LL | asm!("", options(nomem, nomem)); - | ^^^^^ - | -help: remove this option - --> $DIR/duplicate-options.rs:7:33 - | -LL | asm!("", options(nomem, nomem)); - | ^^^^^ + | ^^^^^ remove this option error: the `att_syntax` option was already provided - --> $DIR/duplicate-options.rs:10:38 + --> $DIR/duplicate-options.rs:9:38 | LL | asm!("", options(att_syntax, att_syntax)); - | ^^^^^^^^^^ - | -help: remove this option - --> $DIR/duplicate-options.rs:10:38 - | -LL | asm!("", options(att_syntax, att_syntax)); - | ^^^^^^^^^^ + | ^^^^^^^^^^ remove this option error: the `nostack` option was already provided - --> $DIR/duplicate-options.rs:13:56 + --> $DIR/duplicate-options.rs:11:56 | LL | asm!("", options(nostack, att_syntax), options(nostack)); - | ^^^^^^^ - | -help: remove this option - --> $DIR/duplicate-options.rs:13:56 - | -LL | asm!("", options(nostack, att_syntax), options(nostack)); - | ^^^^^^^ + | ^^^^^^^ remove this option error: the `nostack` option was already provided - --> $DIR/duplicate-options.rs:16:35 + --> $DIR/duplicate-options.rs:13:35 | LL | asm!("", options(nostack, nostack), options(nostack), options(nostack)); - | ^^^^^^^ - | -help: remove this option - --> $DIR/duplicate-options.rs:16:35 - | -LL | asm!("", options(nostack, nostack), options(nostack), options(nostack)); - | ^^^^^^^ + | ^^^^^^^ remove this option error: the `nostack` option was already provided - --> $DIR/duplicate-options.rs:16:53 + --> $DIR/duplicate-options.rs:13:53 | LL | asm!("", options(nostack, nostack), options(nostack), options(nostack)); - | ^^^^^^^ - | -help: remove this option - --> $DIR/duplicate-options.rs:16:53 - | -LL | asm!("", options(nostack, nostack), options(nostack), options(nostack)); - | ^^^^^^^ + | ^^^^^^^ remove this option error: the `nostack` option was already provided - --> $DIR/duplicate-options.rs:16:71 + --> $DIR/duplicate-options.rs:13: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)); - | ^^^^^^^ + | ^^^^^^^ remove this option error: aborting due to 6 previous errors