diff options
| author | Amanieu d'Antras <amanieu@gmail.com> | 2021-04-26 19:49:26 +0100 |
|---|---|---|
| committer | Amanieu d'Antras <amanieu@gmail.com> | 2021-05-13 22:31:58 +0100 |
| commit | bb6bec1d55586abfb6aa6ca924994b09035752dc (patch) | |
| tree | eee60ce0de61e689351e7053a0951ecd4fabc1a4 | |
| parent | 0df83f8e5e85268b0134f8c698e09b5c8d6b3ef6 (diff) | |
| download | rust-bb6bec1d55586abfb6aa6ca924994b09035752dc.tar.gz rust-bb6bec1d55586abfb6aa6ca924994b09035752dc.zip | |
Clarify error message when both asm! and global_asm! are unsupported
| -rw-r--r-- | compiler/rustc_ast_lowering/src/asm.rs | 3 | ||||
| -rw-r--r-- | src/test/ui/asm/bad-arch.rs | 4 | ||||
| -rw-r--r-- | src/test/ui/asm/bad-arch.stderr | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/compiler/rustc_ast_lowering/src/asm.rs b/compiler/rustc_ast_lowering/src/asm.rs index 6acdfa1b5f8..1c3fae2afe7 100644 --- a/compiler/rustc_ast_lowering/src/asm.rs +++ b/compiler/rustc_ast_lowering/src/asm.rs @@ -15,7 +15,8 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> { // lowering the register contraints in this case. let asm_arch = if self.sess.opts.actually_rustdoc { None } else { self.sess.asm_arch }; if asm_arch.is_none() && !self.sess.opts.actually_rustdoc { - struct_span_err!(self.sess, sp, E0472, "asm! is unsupported on this target").emit(); + struct_span_err!(self.sess, sp, E0472, "inline assembly is unsupported on this target") + .emit(); } if asm.options.contains(InlineAsmOptions::ATT_SYNTAX) && !matches!(asm_arch, Some(asm::InlineAsmArch::X86 | asm::InlineAsmArch::X86_64)) diff --git a/src/test/ui/asm/bad-arch.rs b/src/test/ui/asm/bad-arch.rs index b491a70d1e2..3eeb76f3d00 100644 --- a/src/test/ui/asm/bad-arch.rs +++ b/src/test/ui/asm/bad-arch.rs @@ -18,9 +18,9 @@ trait Sized {} fn main() { unsafe { asm!(""); - //~^ ERROR asm! is unsupported on this target + //~^ ERROR inline assembly is unsupported on this target } } global_asm!(""); -//~^ ERROR asm! is unsupported on this target +//~^ ERROR inline assembly is unsupported on this target diff --git a/src/test/ui/asm/bad-arch.stderr b/src/test/ui/asm/bad-arch.stderr index d006320bf45..3ca5bcc707e 100644 --- a/src/test/ui/asm/bad-arch.stderr +++ b/src/test/ui/asm/bad-arch.stderr @@ -1,10 +1,10 @@ -error[E0472]: asm! is unsupported on this target +error[E0472]: inline assembly is unsupported on this target --> $DIR/bad-arch.rs:20:9 | LL | asm!(""); | ^^^^^^^^^ -error[E0472]: asm! is unsupported on this target +error[E0472]: inline assembly is unsupported on this target --> $DIR/bad-arch.rs:25:1 | LL | global_asm!(""); |