merge error codes

Author: folkertdev

compiler/rustc_builtin_macros/src/errors.rs

@@ -914,7 +914,7 @@ pub(crate) struct ExpectedItem<'a> {
 }
 
 #[derive(Diagnostic)]
-#[diag(builtin_macros_naked_functions_testing_attribute, code = E0798)]
+#[diag(builtin_macros_naked_functions_testing_attribute, code = E0736)]
 pub struct NakedFunctionTestingAttribute {
     #[primary_span]
     #[label(builtin_macros_naked_attribute)]

compiler/rustc_error_codes/src/error_codes/E0798.md

@@ -536,7 +536,6 @@ E0794: 0794,
 E0795: 0795,
 E0796: 0796,
 E0797: 0797,
-E0798: 0798,
         );
     )
 }

compiler/rustc_error_codes/src/lib.rs

@@ -10,30 +10,30 @@ use std::arch::asm;
 
 #[test]
 #[naked]
-//~^ ERROR [E0798]
+//~^ ERROR [E0736]
 fn test_naked() {
     unsafe { asm!("", options(noreturn)) };
 }
 
 #[should_panic]
 #[test]
 #[naked]
-//~^ ERROR [E0798]
+//~^ ERROR [E0736]
 fn test_naked_should_panic() {
     unsafe { asm!("", options(noreturn)) };
 }
 
 #[ignore]
 #[test]
 #[naked]
-//~^ ERROR [E0798]
+//~^ ERROR [E0736]
 fn test_naked_ignore() {
     unsafe { asm!("", options(noreturn)) };
 }
 
 #[bench]
 #[naked]
-//~^ ERROR [E0798]
+//~^ ERROR [E0736]
 fn bench_naked() {
     unsafe { asm!("", options(noreturn)) };
 }

tests/ui/asm/naked-functions-testattrs.rs

@@ -1,28 +1,28 @@
-error[E0798]: cannot use `#[naked]` with testing attributes
+error[E0736]: cannot use `#[naked]` with testing attributes
   --> $DIR/naked-functions-testattrs.rs:12:1
    |
 LL | #[test]
    | ------- function marked with testing attribute here
 LL | #[naked]
    | ^^^^^^^^ `#[naked]` is incompatible with testing attributes
 
-error[E0798]: cannot use `#[naked]` with testing attributes
+error[E0736]: cannot use `#[naked]` with testing attributes
   --> $DIR/naked-functions-testattrs.rs:20:1
    |
 LL | #[test]
    | ------- function marked with testing attribute here
 LL | #[naked]
    | ^^^^^^^^ `#[naked]` is incompatible with testing attributes
 
-error[E0798]: cannot use `#[naked]` with testing attributes
+error[E0736]: cannot use `#[naked]` with testing attributes
   --> $DIR/naked-functions-testattrs.rs:28:1
    |
 LL | #[test]
    | ------- function marked with testing attribute here
 LL | #[naked]
    | ^^^^^^^^ `#[naked]` is incompatible with testing attributes
 
-error[E0798]: cannot use `#[naked]` with testing attributes
+error[E0736]: cannot use `#[naked]` with testing attributes
   --> $DIR/naked-functions-testattrs.rs:35:1
    |
 LL | #[bench]
@@ -32,4 +32,4 @@ LL | #[naked]
 
 error: aborting due to 4 previous errors
 
-For more information about this error, try `rustc --explain E0798`.
+For more information about this error, try `rustc --explain E0736`.