3 files changed, 6 insertions, 24 deletions
diff --git a/compiler/rustc_error_codes/src/error_codes/E0736.md b/compiler/rustc_error_codes/src/error_codes/E0736.md
index 08aa85e705d..4660d610744 100644
--- a/compiler/rustc_error_codes/src/error_codes/E0736.md
+++ b/compiler/rustc_error_codes/src/error_codes/E0736.md
@@ -1,11 +1,12 @@
 Functions marked with the `#[naked]` attribute are restricted in what other
-code generation attributes they may be marked with.
+attributes they may be marked with.
 
-The following code generation attributes are incompatible with `#[naked]`:
+Notable attributes that are incompatible with `#[naked]` are:
 
-  * `#[inline]`
-  * `#[track_caller]`
-  * `#[target_feature]`
+* `#[inline]`
+* `#[track_caller]`
+* `#[target_feature]`
+* `#[test]`, `#[ignore]`, `#[should_panic]`
 
 Erroneous code example:
 
@@ -18,7 +19,3 @@ fn foo() {}
 These incompatibilities are due to the fact that naked functions deliberately
 impose strict restrictions regarding the code that the compiler is
 allowed to produce for this function.
-
-See [the reference page for codegen attributes] for more information.
-
-[the reference page for codegen attributes]: https://doc.rust-lang.org/reference/attributes/codegen.html
diff --git a/compiler/rustc_error_codes/src/error_codes/E0798.md b/compiler/rustc_error_codes/src/error_codes/E0798.md
deleted file mode 100644
index 96f25eb4f0e..00000000000
--- a/compiler/rustc_error_codes/src/error_codes/E0798.md
+++ /dev/null
@@ -1,14 +0,0 @@
-Testing attributes cannot be applied to functions marked with `#[naked]`.
-
-Erroneous code example:
-
-```ignore (requires test runner)
-#[test]
-#[should_panic]
-#[naked]
-fn foo() {}
-```
-
-See [the reference page for testing attributes] for more information.
-
-[the reference page for testing attributes]: https://doc.rust-lang.org/reference/attributes/testing.html
diff --git a/compiler/rustc_error_codes/src/lib.rs b/compiler/rustc_error_codes/src/lib.rs
index 2a7bc2501c0..d13d5e1bca2 100644
--- a/compiler/rustc_error_codes/src/lib.rs
+++ b/compiler/rustc_error_codes/src/lib.rs
@@ -536,7 +536,6 @@ E0794: 0794,
 E0795: 0795,
 E0796: 0796,
 E0797: 0797,
-E0798: 0798,
         );
     )
 }