Auto merge of #84068 - Amanieu:fix_lint, r=lcnr

bors · bors · commit c18c0ad2bc59 · 2021-04-12T10:49:39.000Z
Add `bad_asm_style` to  HardwiredLints

This was missed when the lint was added, which prevents the lint from being ignored with `#[allow]`.
diff --git a/compiler/rustc_lint_defs/src/builtin.rs b/compiler/rustc_lint_defs/src/builtin.rs
@@ -2944,6 +2944,7 @@ declare_lint_pass! {
         NONTRIVIAL_STRUCTURAL_MATCH,
         SOFT_UNSTABLE,
         INLINE_NO_SANITIZE,
+        BAD_ASM_STYLE,
         ASM_SUB_REGISTER,
         UNSAFE_OP_IN_UNSAFE_FN,
         INCOMPLETE_INCLUDE,
diff --git a/src/test/ui/asm/inline-syntax.arm.stderr b/src/test/ui/asm/inline-syntax.arm.stderr
@@ -1,5 +1,5 @@
 error: unknown directive
-  --> $DIR/inline-syntax.rs:22:15
+  --> $DIR/inline-syntax.rs:25:15
    |
 LL |         asm!(".intel_syntax noprefix", "nop");
    |               ^
@@ -11,7 +11,7 @@ LL |     .intel_syntax noprefix
    |     ^
 
 error: unknown directive
-  --> $DIR/inline-syntax.rs:25:15
+  --> $DIR/inline-syntax.rs:28:15
    |
 LL |         asm!(".intel_syntax aaa noprefix", "nop");
    |               ^
@@ -23,7 +23,7 @@ LL |     .intel_syntax aaa noprefix
    |     ^
 
 error: unknown directive
-  --> $DIR/inline-syntax.rs:28:15
+  --> $DIR/inline-syntax.rs:31:15
    |
 LL |         asm!(".att_syntax noprefix", "nop");
    |               ^
@@ -35,7 +35,7 @@ LL |     .att_syntax noprefix
    |     ^
 
 error: unknown directive
-  --> $DIR/inline-syntax.rs:31:15
+  --> $DIR/inline-syntax.rs:34:15
    |
 LL |         asm!(".att_syntax bbb noprefix", "nop");
    |               ^
@@ -47,7 +47,7 @@ LL |     .att_syntax bbb noprefix
    |     ^
 
 error: unknown directive
-  --> $DIR/inline-syntax.rs:34:15
+  --> $DIR/inline-syntax.rs:37:15
    |
 LL |         asm!(".intel_syntax noprefix; nop");
    |               ^
@@ -59,7 +59,7 @@ LL |     .intel_syntax noprefix; nop
    |     ^
 
 error: unknown directive
-  --> $DIR/inline-syntax.rs:40:13
+  --> $DIR/inline-syntax.rs:43:13
    |
 LL |             .intel_syntax noprefix
    |             ^
diff --git a/src/test/ui/asm/inline-syntax.rs b/src/test/ui/asm/inline-syntax.rs
@@ -2,12 +2,15 @@
 // revisions: x86_64 arm
 //[x86_64] compile-flags: --target x86_64-unknown-linux-gnu
 //[x86_64] check-pass
+//[x86_64_allowed] compile-flags: --target x86_64-unknown-linux-gnu
+//[x86_64_allowed] check-pass
 //[arm] compile-flags: --target armv7-unknown-linux-gnueabihf
 //[arm] build-fail
 
 #![feature(no_core, lang_items, rustc_attrs)]
 #![crate_type = "rlib"]
 #![no_core]
+#![cfg_attr(x86_64_allowed, allow(bad_asm_style))]
 
 #[rustc_builtin_macro]
 macro_rules! asm {
diff --git a/src/test/ui/asm/inline-syntax.x86_64.stderr b/src/test/ui/asm/inline-syntax.x86_64.stderr
@@ -1,37 +1,37 @@
 warning: avoid using `.intel_syntax`, Intel syntax is the default
-  --> $DIR/inline-syntax.rs:22:15
+  --> $DIR/inline-syntax.rs:25:15
    |
 LL |         asm!(".intel_syntax noprefix", "nop");
    |               ^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: `#[warn(bad_asm_style)]` on by default
 
 warning: avoid using `.intel_syntax`, Intel syntax is the default
-  --> $DIR/inline-syntax.rs:25:15
+  --> $DIR/inline-syntax.rs:28:15
    |
 LL |         asm!(".intel_syntax aaa noprefix", "nop");
    |               ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 warning: avoid using `.att_syntax`, prefer using `options(att_syntax)` instead
-  --> $DIR/inline-syntax.rs:28:15
+  --> $DIR/inline-syntax.rs:31:15
    |
 LL |         asm!(".att_syntax noprefix", "nop");
    |               ^^^^^^^^^^^^^^^^^^^^
 
 warning: avoid using `.att_syntax`, prefer using `options(att_syntax)` instead
-  --> $DIR/inline-syntax.rs:31:15
+  --> $DIR/inline-syntax.rs:34:15
    |
 LL |         asm!(".att_syntax bbb noprefix", "nop");
    |               ^^^^^^^^^^^^^^^^^^^^^^^^
 
 warning: avoid using `.intel_syntax`, Intel syntax is the default
-  --> $DIR/inline-syntax.rs:34:15
+  --> $DIR/inline-syntax.rs:37:15
    |
 LL |         asm!(".intel_syntax noprefix; nop");
    |               ^^^^^^^^^^^^^^^^^^^^^^
 
 warning: avoid using `.intel_syntax`, Intel syntax is the default
-  --> $DIR/inline-syntax.rs:40:13
+  --> $DIR/inline-syntax.rs:43:13
    |
 LL |             .intel_syntax noprefix
    |             ^^^^^^^^^^^^^^^^^^^^^^

Original file line number	Diff line number	Diff line change
`@@ -1,37 +1,37 @@`
`1`	`1`	warning: avoid using `.intel_syntax`, Intel syntax is the default
`2`		`- --> $DIR/inline-syntax.rs:22:15`
	`2`	`+ --> $DIR/inline-syntax.rs:25:15`
`3`	`3`	`\|`
`4`	`4`	`LL \| asm!(".intel_syntax noprefix", "nop");`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^^^^^^^`
`6`	`6`	`\|`
`7`	`7`	= note: `#[warn(bad_asm_style)]` on by default
`8`	`8`
`9`	`9`	warning: avoid using `.intel_syntax`, Intel syntax is the default
`10`		`- --> $DIR/inline-syntax.rs:25:15`
	`10`	`+ --> $DIR/inline-syntax.rs:28:15`
`11`	`11`	`\|`
`12`	`12`	`LL \| asm!(".intel_syntax aaa noprefix", "nop");`
`13`	`13`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^^`
`14`	`14`
`15`	`15`	warning: avoid using `.att_syntax`, prefer using `options(att_syntax)` instead
`16`		`- --> $DIR/inline-syntax.rs:28:15`
	`16`	`+ --> $DIR/inline-syntax.rs:31:15`
`17`	`17`	`\|`
`18`	`18`	`LL \| asm!(".att_syntax noprefix", "nop");`
`19`	`19`	`\| ^^^^^^^^^^^^^^^^^^^^`
`20`	`20`
`21`	`21`	warning: avoid using `.att_syntax`, prefer using `options(att_syntax)` instead
`22`		`- --> $DIR/inline-syntax.rs:31:15`
	`22`	`+ --> $DIR/inline-syntax.rs:34:15`
`23`	`23`	`\|`
`24`	`24`	`LL \| asm!(".att_syntax bbb noprefix", "nop");`
`25`	`25`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^`
`26`	`26`
`27`	`27`	warning: avoid using `.intel_syntax`, Intel syntax is the default
`28`		`- --> $DIR/inline-syntax.rs:34:15`
	`28`	`+ --> $DIR/inline-syntax.rs:37:15`
`29`	`29`	`\|`
`30`	`30`	`LL \| asm!(".intel_syntax noprefix; nop");`
`31`	`31`	`\| ^^^^^^^^^^^^^^^^^^^^^^`
`32`	`32`
`33`	`33`	warning: avoid using `.intel_syntax`, Intel syntax is the default
`34`		`- --> $DIR/inline-syntax.rs:40:13`
	`34`	`+ --> $DIR/inline-syntax.rs:43:13`
`35`	`35`	`\|`
`36`	`36`	`LL \| .intel_syntax noprefix`
`37`	`37`	`\| ^^^^^^^^^^^^^^^^^^^^^^`