Rollup merge of #62764 - fakenine:normalize_use_of_backticks_compiler_messages_p7, r=alexreg

normalize use of backticks in compiler messages for librustc/lint

https://github.com/rust-lang/rust/issues/60532

149 files changed, 177 insertions, 177 deletions

diff --git a/src/librustc/lint/builtin.rs b/src/librustc/lint/builtin.rs
index d1cae76de60..3b66b07c2f4 100644
--- a/src/librustc/lint/builtin.rs
+++ b/src/librustc/lint/builtin.rs
@@ -94,19 +94,19 @@ declare_lint! {
 declare_lint! {
     pub UNUSED_FEATURES,
     Warn,
-    "unused features found in crate-level #[feature] directives"
+    "unused features found in crate-level `#[feature]` directives"
 }
 
 declare_lint! {
     pub STABLE_FEATURES,
     Warn,
-    "stable features found in #[feature] directive"
+    "stable features found in `#[feature]` directive"
 }
 
 declare_lint! {
     pub UNKNOWN_CRATE_TYPES,
     Deny,
-    "unknown crate type found in #[crate_type] directive"
+    "unknown crate type found in `#[crate_type]` directive"
 }
 
 declare_lint! {
diff --git a/src/librustc/lint/mod.rs b/src/librustc/lint/mod.rs
index e76c2493200..3683a375994 100644
--- a/src/librustc/lint/mod.rs
+++ b/src/librustc/lint/mod.rs
@@ -671,7 +671,7 @@ pub fn struct_lint_level<'a>(sess: &'a Session,
             sess.diag_note_once(
                 &mut err,
                 DiagnosticMessageId::from(lint),
-                &format!("#[{}({})] on by default", level.as_str(), name));
+                &format!("`#[{}({})]` on by default", level.as_str(), name));
         }
         LintSource::CommandLine(lint_flag_val) => {
             let flag = match level {
@@ -706,7 +706,7 @@ pub fn struct_lint_level<'a>(sess: &'a Session,
             if lint_attr_name.as_str() != name {
                 let level_str = level.as_str();
                 sess.diag_note_once(&mut err, DiagnosticMessageId::from(lint),
-                                    &format!("#[{}({})] implied by #[{}({})]",
+                                    &format!("`#[{}({})]` implied by `#[{}({})]`",
                                              level_str, name, level_str, lint_attr_name));
             }
         }
diff --git a/src/test/run-pass/extern/extern-prelude-core.stderr b/src/test/run-pass/extern/extern-prelude-core.stderr
index 8d2a0b7425f..f90eb933d3f 100644
--- a/src/test/run-pass/extern/extern-prelude-core.stderr
+++ b/src/test/run-pass/extern/extern-prelude-core.stderr
@@ -4,5 +4,5 @@ warning: the feature `extern_prelude` has been stable since 1.30.0 and no longer
 LL | #![feature(extern_prelude, lang_items, start)]
    |            ^^^^^^^^^^^^^^
    |
-   = note: #[warn(stable_features)] on by default
+   = note: `#[warn(stable_features)]` on by default
 
diff --git a/src/test/run-pass/extern/extern-prelude-std.stderr b/src/test/run-pass/extern/extern-prelude-std.stderr
index f193c57146d..73b1dcfd5e1 100644
--- a/src/test/run-pass/extern/extern-prelude-std.stderr
+++ b/src/test/run-pass/extern/extern-prelude-std.stderr
@@ -4,5 +4,5 @@ warning: the feature `extern_prelude` has been stable since 1.30.0 and no longer
 LL | #![feature(extern_prelude)]
    |            ^^^^^^^^^^^^^^
    |
-   = note: #[warn(stable_features)] on by default
+   = note: `#[warn(stable_features)]` on by default
 
diff --git a/src/test/run-pass/if-ret.stderr b/src/test/run-pass/if-ret.stderr
index a64281833e5..7c02f835685 100644
--- a/src/test/run-pass/if-ret.stderr
+++ b/src/test/run-pass/if-ret.stderr
@@ -4,5 +4,5 @@ warning: unreachable block in `if` expression
 LL | fn foo() { if (return) { } }
    |                        ^^^
    |
-   = note: #[warn(unreachable_code)] on by default
+   = note: `#[warn(unreachable_code)]` on by default
 
diff --git a/src/test/run-pass/macros/macro-use-all-and-none.stderr b/src/test/run-pass/macros/macro-use-all-and-none.stderr
index 66282a4f11d..ce12a539541 100644
--- a/src/test/run-pass/macros/macro-use-all-and-none.stderr
+++ b/src/test/run-pass/macros/macro-use-all-and-none.stderr
@@ -4,5 +4,5 @@ warning: unused attribute
 LL | #[macro_use()]
    | ^^^^^^^^^^^^^^
    |
-   = note: #[warn(unused_attributes)] on by default
+   = note: `#[warn(unused_attributes)]` on by default
 
diff --git a/src/test/run-pass/rfcs/rfc-2126-crate-paths/crate-path-absolute.stderr b/src/test/run-pass/rfcs/rfc-2126-crate-paths/crate-path-absolute.stderr
index ac4b51bdb58..12f799f6e47 100644
--- a/src/test/run-pass/rfcs/rfc-2126-crate-paths/crate-path-absolute.stderr
+++ b/src/test/run-pass/rfcs/rfc-2126-crate-paths/crate-path-absolute.stderr
@@ -4,5 +4,5 @@ warning: the feature `crate_in_paths` has been stable since 1.30.0 and no longer
 LL | #![feature(crate_in_paths)]
    |            ^^^^^^^^^^^^^^
    |
-   = note: #[warn(stable_features)] on by default
+   = note: `#[warn(stable_features)]` on by default
 
diff --git a/src/test/run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity.stderr b/src/test/run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity.stderr
index 63d3a2ea5db..23a0e544554 100644
--- a/src/test/run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity.stderr
+++ b/src/test/run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity.stderr
@@ -4,5 +4,5 @@ warning: the feature `crate_in_paths` has been stable since 1.30.0 and no longer
 LL | #![feature(crate_in_paths)]
    |            ^^^^^^^^^^^^^^
    |
-   = note: #[warn(stable_features)] on by default
+   = note: `#[warn(stable_features)]` on by default
 
diff --git a/src/test/rustdoc-ui/intra-links-warning-crlf.stderr b/src/test/rustdoc-ui/intra-links-warning-crlf.stderr
index 8ccc04a4c0b..720f2106e3d 100644
--- a/src/test/rustdoc-ui/intra-links-warning-crlf.stderr
+++ b/src/test/rustdoc-ui/intra-links-warning-crlf.stderr
@@ -4,7 +4,7 @@ warning: `[error]` cannot be resolved, ignoring it...
 LL | /// [error]
    |      ^^^^^ cannot be resolved, ignoring
    |
-   = note: #[warn(intra_doc_link_resolution_failure)] on by default
+   = note: `#[warn(intra_doc_link_resolution_failure)]` on by default
    = help: to escape `[` and `]` characters, just add '\' before them like `\[` or `\]`
 
 warning: `[error1]` cannot be resolved, ignoring it...
diff --git a/src/test/rustdoc-ui/intra-links-warning.stderr b/src/test/rustdoc-ui/intra-links-warning.stderr
index 1eec3c57b68..dac564b3041 100644
--- a/src/test/rustdoc-ui/intra-links-warning.stderr
+++ b/src/test/rustdoc-ui/intra-links-warning.stderr
@@ -4,7 +4,7 @@ warning: `[Foo::baz]` cannot be resolved, ignoring it...
 LL |        //! Test with [Foo::baz], [Bar::foo], ...
    |                       ^^^^^^^^ cannot be resolved, ignoring
    |
-   = note: #[warn(intra_doc_link_resolution_failure)] on by default
+   = note: `#[warn(intra_doc_link_resolution_failure)]` on by default
    = help: to escape `[` and `]` characters, just add '\' before them like `\[` or `\]`
 
 warning: `[Bar::foo]` cannot be resolved, ignoring it...
diff --git a/src/test/rustdoc-ui/lint-group.stderr b/src/test/rustdoc-ui/lint-group.stderr
index 24db3453ec5..cd523b227de 100644
--- a/src/test/rustdoc-ui/lint-group.stderr
+++ b/src/test/rustdoc-ui/lint-group.stderr
@@ -13,7 +13,7 @@ note: lint level defined here
    |
 LL | #![deny(rustdoc)]
    |         ^^^^^^^
-   = note: #[deny(private_doc_tests)] implied by #[deny(rustdoc)]
+   = note: `#[deny(private_doc_tests)]` implied by `#[deny(rustdoc)]`
 
 error: `[error]` cannot be resolved, ignoring it...
   --> $DIR/lint-group.rs:9:29
@@ -26,7 +26,7 @@ note: lint level defined here
    |
 LL | #![deny(rustdoc)]
    |         ^^^^^^^
-   = note: #[deny(intra_doc_link_resolution_failure)] implied by #[deny(rustdoc)]
+   = note: `#[deny(intra_doc_link_resolution_failure)]` implied by `#[deny(rustdoc)]`
    = help: to escape `[` and `]` characters, just add '\' before them like `\[` or `\]`
 
 error: Missing code example in this documentation
@@ -40,7 +40,7 @@ note: lint level defined here
    |
 LL | #![deny(rustdoc)]
    |         ^^^^^^^
-   = note: #[deny(missing_doc_code_examples)] implied by #[deny(rustdoc)]
+   = note: `#[deny(missing_doc_code_examples)]` implied by `#[deny(rustdoc)]`
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui-fulldeps/deprecated-derive.stderr b/src/test/ui-fulldeps/deprecated-derive.stderr
index 9afb3a35cb4..efaf82d9be1 100644
--- a/src/test/ui-fulldeps/deprecated-derive.stderr
+++ b/src/test/ui-fulldeps/deprecated-derive.stderr
@@ -4,5 +4,5 @@ warning: use of deprecated item 'Encodable': derive(Encodable) is deprecated in
 LL | #[derive(Encodable)]
    |          ^^^^^^^^^
    |
-   = note: #[warn(deprecated)] on by default
+   = note: `#[warn(deprecated)]` on by default
 
diff --git a/src/test/ui-fulldeps/lint-group-plugin.stderr b/src/test/ui-fulldeps/lint-group-plugin.stderr
index 8ccf9700b9f..1af34b306e3 100644
--- a/src/test/ui-fulldeps/lint-group-plugin.stderr
+++ b/src/test/ui-fulldeps/lint-group-plugin.stderr
@@ -4,7 +4,7 @@ warning: item is named 'lintme'
 LL | fn lintme() { }
    | ^^^^^^^^^^^^^^^
    |
-   = note: #[warn(test_lint)] on by default
+   = note: `#[warn(test_lint)]` on by default
 
 warning: item is named 'pleaselintme'
   --> $DIR/lint-group-plugin.rs:10:1
@@ -12,5 +12,5 @@ warning: item is named 'pleaselintme'
 LL | fn pleaselintme() { }
    | ^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: #[warn(please_lint)] on by default
+   = note: `#[warn(please_lint)]` on by default
 
diff --git a/src/test/ui-fulldeps/lint-plugin-cmdline-allow.stderr b/src/test/ui-fulldeps/lint-plugin-cmdline-allow.stderr
index a9b27beb7df..c731796d482 100644
--- a/src/test/ui-fulldeps/lint-plugin-cmdline-allow.stderr
+++ b/src/test/ui-fulldeps/lint-plugin-cmdline-allow.stderr
@@ -9,5 +9,5 @@ note: lint level defined here
    |
 LL | #![warn(unused)]
    |         ^^^^^^
-   = note: #[warn(dead_code)] implied by #[warn(unused)]
+   = note: `#[warn(dead_code)]` implied by `#[warn(unused)]`
 
diff --git a/src/test/ui-fulldeps/lint-plugin-cmdline-load.stderr b/src/test/ui-fulldeps/lint-plugin-cmdline-load.stderr
index 0b2dbad884c..5a6b35433ac 100644
--- a/src/test/ui-fulldeps/lint-plugin-cmdline-load.stderr
+++ b/src/test/ui-fulldeps/lint-plugin-cmdline-load.stderr
@@ -4,5 +4,5 @@ warning: item is named 'lintme'
 LL | fn lintme() { }
    | ^^^^^^^^^^^^^^^
    |
-   = note: #[warn(test_lint)] on by default
+   = note: `#[warn(test_lint)]` on by default
 
diff --git a/src/test/ui-fulldeps/lint-plugin.stderr b/src/test/ui-fulldeps/lint-plugin.stderr
index 94791e369fc..beea00ba453 100644
--- a/src/test/ui-fulldeps/lint-plugin.stderr
+++ b/src/test/ui-fulldeps/lint-plugin.stderr
@@ -4,5 +4,5 @@ warning: item is named 'lintme'
 LL | fn lintme() { }
    | ^^^^^^^^^^^^^^^
    |
-   = note: #[warn(test_lint)] on by default
+   = note: `#[warn(test_lint)]` on by default
 
diff --git a/src/test/ui-fulldeps/lint-tool-cmdline-allow.stderr b/src/test/ui-fulldeps/lint-tool-cmdline-allow.stderr
index 1d851013831..b4919bc339d 100644
--- a/src/test/ui-fulldeps/lint-tool-cmdline-allow.stderr
+++ b/src/test/ui-fulldeps/lint-tool-cmdline-allow.stderr
@@ -8,7 +8,7 @@ warning: item is named 'lintme'
 LL | fn lintme() {}
    | ^^^^^^^^^^^^^^
    |
-   = note: #[warn(clippy::test_lint)] on by default
+   = note: `#[warn(clippy::test_lint)]` on by default
 
 warning: function is never used: `lintme`
   --> $DIR/lint-tool-cmdline-allow.rs:10:1
@@ -21,5 +21,5 @@ note: lint level defined here
    |
 LL | #![warn(unused)]
    |         ^^^^^^
-   = note: #[warn(dead_code)] implied by #[warn(unused)]
+   = note: `#[warn(dead_code)]` implied by `#[warn(unused)]`
 
diff --git a/src/test/ui-fulldeps/lint-tool-test.stderr b/src/test/ui-fulldeps/lint-tool-test.stderr
index 67e55e65c7e..16fe6f6613b 100644
--- a/src/test/ui-fulldeps/lint-tool-test.stderr
+++ b/src/test/ui-fulldeps/lint-tool-test.stderr
@@ -4,7 +4,7 @@ warning: lint name `test_lint` is deprecated and may not have an effect in the f
 LL | #![cfg_attr(foo, warn(test_lint))]
    |                       ^^^^^^^^^ help: change it to: `clippy::test_lint`
    |
-   = note: #[warn(renamed_and_removed_lints)] on by default
+   = note: `#[warn(renamed_and_removed_lints)]` on by default
 
 warning: lint name `clippy_group` is deprecated and may not have an effect in the future. Also `cfg_attr(cargo-clippy)` won't be necessary anymore
   --> $DIR/lint-tool-test.rs:11:9
@@ -24,7 +24,7 @@ warning: unknown lint: `this_lint_does_not_exist`
 LL | #[deny(this_lint_does_not_exist)]
    |        ^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: #[warn(unknown_lints)] on by default
+   = note: `#[warn(unknown_lints)]` on by default
 
 warning: lint name `test_lint` is deprecated and may not have an effect in the future. Also `cfg_attr(cargo-clippy)` won't be necessary anymore
   --> $DIR/lint-tool-test.rs:8:23
@@ -43,7 +43,7 @@ note: lint level defined here
    |
 LL | #![deny(clippy_group)]
    |         ^^^^^^^^^^^^
-   = note: #[deny(clippy::test_lint)] implied by #[deny(clippy::group)]
+   = note: `#[deny(clippy::test_lint)]` implied by `#[deny(clippy::group)]`
 
 error: item is named 'lintmetoo'
   --> $DIR/lint-tool-test.rs:22:5
@@ -56,7 +56,7 @@ note: lint level defined here
    |
 LL | #![deny(clippy_group)]
    |         ^^^^^^^^^^^^
-   = note: #[deny(clippy::test_group)] implied by #[deny(clippy::group)]
+   = note: `#[deny(clippy::test_group)]` implied by `#[deny(clippy::group)]`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/array_const_index-0.stderr b/src/test/ui/array_const_index-0.stderr
index 78d456d6c2e..16ebc4a5775 100644
--- a/src/test/ui/array_const_index-0.stderr
+++ b/src/test/ui/array_const_index-0.stderr
@@ -6,7 +6,7 @@ LL | const B: i32 = (&A)[1];
    |                |
    |                index out of bounds: the len is 0 but the index is 1
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/array_const_index-1.stderr b/src/test/ui/array_const_index-1.stderr
index 3e7360f935b..98a64eaadcf 100644
--- a/src/test/ui/array_const_index-1.stderr
+++ b/src/test/ui/array_const_index-1.stderr
@@ -6,7 +6,7 @@ LL | const B: i32 = A[1];
    |                |
    |                index out of bounds: the len is 0 but the index is 1
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/associated-type-bounds/type-alias.stderr b/src/test/ui/associated-type-bounds/type-alias.stderr
index b93fc393ae3..a3fa97f54e3 100644
--- a/src/test/ui/associated-type-bounds/type-alias.stderr
+++ b/src/test/ui/associated-type-bounds/type-alias.stderr
@@ -4,7 +4,7 @@ warning: where clauses are not enforced in type aliases
 LL | type _TaWhere1<T> where T: Iterator<Item: Copy> = T;
    |                         ^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: #[warn(type_alias_bounds)] on by default
+   = note: `#[warn(type_alias_bounds)]` on by default
    = help: the clause will not be checked when the type alias is used, and should be removed
 
 warning: where clauses are not enforced in type aliases
diff --git a/src/test/ui/bad/bad-lint-cap2.stderr b/src/test/ui/bad/bad-lint-cap2.stderr
index f6e67e6d78d..75e257893fa 100644
--- a/src/test/ui/bad/bad-lint-cap2.stderr
+++ b/src/test/ui/bad/bad-lint-cap2.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![deny(warnings)]
    |         ^^^^^^^^
-   = note: #[deny(unused_imports)] implied by #[deny(warnings)]
+   = note: `#[deny(unused_imports)]` implied by `#[deny(warnings)]`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/bad/bad-lint-cap3.stderr b/src/test/ui/bad/bad-lint-cap3.stderr
index b898d792f65..96b40c98c0e 100644
--- a/src/test/ui/bad/bad-lint-cap3.stderr
+++ b/src/test/ui/bad/bad-lint-cap3.stderr
@@ -9,5 +9,5 @@ note: lint level defined here
    |
 LL | #![deny(warnings)]
    |         ^^^^^^^^
-   = note: #[warn(unused_imports)] implied by #[warn(warnings)]
+   = note: `#[warn(unused_imports)]` implied by `#[warn(warnings)]`
 
diff --git a/src/test/ui/block-result/block-must-not-have-result-while.stderr b/src/test/ui/block-result/block-must-not-have-result-while.stderr
index c41afcc9121..44f62875ef1 100644
--- a/src/test/ui/block-result/block-must-not-have-result-while.stderr
+++ b/src/test/ui/block-result/block-must-not-have-result-while.stderr
@@ -4,7 +4,7 @@ warning: denote infinite loops with `loop { ... }`
 LL |     while true {
    |     ^^^^^^^^^^ help: use `loop`
    |
-   = note: #[warn(while_true)] on by default
+   = note: `#[warn(while_true)]` on by default
 
 error[E0308]: mismatched types
   --> $DIR/block-must-not-have-result-while.rs:3:9
diff --git a/src/test/ui/borrowck/mut-borrow-in-loop.stderr b/src/test/ui/borrowck/mut-borrow-in-loop.stderr
index 59cf4d533de..daee1a0d5cf 100644
--- a/src/test/ui/borrowck/mut-borrow-in-loop.stderr
+++ b/src/test/ui/borrowck/mut-borrow-in-loop.stderr
@@ -4,7 +4,7 @@ warning: denote infinite loops with `loop { ... }`
 LL |         while true {
    |         ^^^^^^^^^^ help: use `loop`
    |
-   = note: #[warn(while_true)] on by default
+   = note: `#[warn(while_true)]` on by default
 
 error[E0499]: cannot borrow `*arg` as mutable more than once at a time
   --> $DIR/mut-borrow-in-loop.rs:10:25
diff --git a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.migrate2015.stderr b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.migrate2015.stderr
index 8eb468892f2..565e433f773 100644
--- a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.migrate2015.stderr
+++ b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.migrate2015.stderr
@@ -31,7 +31,7 @@ LL |     v.push(shared.len());
    |     |
    |     mutable borrow occurs here
    |
-   = note: #[warn(mutable_borrow_reservation_conflict)] on by default
+   = note: `#[warn(mutable_borrow_reservation_conflict)]` on by default
    = warning: this borrowing pattern was not meant to be accepted, and may become a hard error in the future
    = note: for more information, see issue #59159 <https://github.com/rust-lang/rust/issues/59159>
 
diff --git a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.migrate2018.stderr b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.migrate2018.stderr
index 8eb468892f2..565e433f773 100644
--- a/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.migrate2018.stderr
+++ b/src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.migrate2018.stderr
@@ -31,7 +31,7 @@ LL |     v.push(shared.len());
    |     |
    |     mutable borrow occurs here
    |
-   = note: #[warn(mutable_borrow_reservation_conflict)] on by default
+   = note: `#[warn(mutable_borrow_reservation_conflict)]` on by default
    = warning: this borrowing pattern was not meant to be accepted, and may become a hard error in the future
    = note: for more information, see issue #59159 <https://github.com/rust-lang/rust/issues/59159>
 
diff --git a/src/test/ui/codemap_tests/unicode_3.stderr b/src/test/ui/codemap_tests/unicode_3.stderr
index 56f4f73131f..cc1a80bc074 100644
--- a/src/test/ui/codemap_tests/unicode_3.stderr
+++ b/src/test/ui/codemap_tests/unicode_3.stderr
@@ -4,5 +4,5 @@ warning: denote infinite loops with `loop { ... }`
 LL |     let s = "ZͨA͑ͦ͒͋ͤ͑̚L̄͑͋Ĝͨͥ̿͒̽̈́Oͥ͛ͭ!̏"; while true { break; }
    |                       ^^^^^^^^^^ help: use `loop`
    |
-   = note: #[warn(while_true)] on by default
+   = note: `#[warn(while_true)]` on by default
 
diff --git a/src/test/ui/conditional-compilation/cfg-attr-empty-is-unused.stderr b/src/test/ui/conditional-compilation/cfg-attr-empty-is-unused.stderr
index cd3563e66c7..046defd5561 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-empty-is-unused.stderr
+++ b/src/test/ui/conditional-compilation/cfg-attr-empty-is-unused.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![deny(unused)]
    |         ^^^^^^
-   = note: #[deny(unused_attributes)] implied by #[deny(unused)]
+   = note: `#[deny(unused_attributes)]` implied by `#[deny(unused)]`
 
 error: unused attribute
   --> $DIR/cfg-attr-empty-is-unused.rs:10:1
diff --git a/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr b/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr
index 64e9570773a..f55671f6bba 100644
--- a/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr
+++ b/src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr
@@ -4,7 +4,7 @@ warning: use of deprecated item 'MustUseDeprecated'
 LL | impl MustUseDeprecated {
    |      ^^^^^^^^^^^^^^^^^
    |
-   = note: #[warn(deprecated)] on by default
+   = note: `#[warn(deprecated)]` on by default
 
 warning: use of deprecated item 'MustUseDeprecated'
   --> $DIR/cfg-attr-multi-true.rs:19:5
diff --git a/src/test/ui/consts/array-literal-index-oob.stderr b/src/test/ui/consts/array-literal-index-oob.stderr
index 727ce9e57a4..18a09fdda7b 100644
--- a/src/test/ui/consts/array-literal-index-oob.stderr
+++ b/src/test/ui/consts/array-literal-index-oob.stderr
@@ -4,7 +4,7 @@ error: index out of bounds: the len is 3 but the index is 4
 LL |     &{[1, 2, 3][4]};
    |       ^^^^^^^^^^^^
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
 
 error: this expression will panic at runtime
   --> $DIR/array-literal-index-oob.rs:2:5
diff --git a/src/test/ui/consts/const-eval/const-pointer-values-in-various-types.stderr b/src/test/ui/consts/const-eval/const-pointer-values-in-various-types.stderr
index 284b06984a3..73aca911531 100644
--- a/src/test/ui/consts/const-eval/const-pointer-values-in-various-types.stderr
+++ b/src/test/ui/consts/const-eval/const-pointer-values-in-various-types.stderr
@@ -14,7 +14,7 @@ LL |     const I32_REF_U8_UNION: u8 = unsafe { Nonsense { int_32_ref: &3 }.uint_
    |                                           |
    |                                           a raw memory access tried to access part of a pointer value as raw bytes
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
 
 error: any use of this value will cause an error
   --> $DIR/const-pointer-values-in-various-types.rs:30:45
diff --git a/src/test/ui/consts/const-eval/const_panic.stderr b/src/test/ui/consts/const-eval/const_panic.stderr
index 12c7e3d34ab..8a51d8aa882 100644
--- a/src/test/ui/consts/const-eval/const_panic.stderr
+++ b/src/test/ui/consts/const-eval/const_panic.stderr
@@ -6,7 +6,7 @@ LL | pub const Z: () = panic!("cheese");
    |                   |
    |                   the evaluated program panicked at 'cheese', $DIR/const_panic.rs:4:19
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 error: any use of this value will cause an error
diff --git a/src/test/ui/consts/const-eval/const_panic_libcore.stderr b/src/test/ui/consts/const-eval/const_panic_libcore.stderr
index 9dddac49c92..e76446f1015 100644
--- a/src/test/ui/consts/const-eval/const_panic_libcore.stderr
+++ b/src/test/ui/consts/const-eval/const_panic_libcore.stderr
@@ -6,7 +6,7 @@ LL | const Z: () = panic!("cheese");
    |               |
    |               the evaluated program panicked at 'cheese', $DIR/const_panic_libcore.rs:5:15
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 error: any use of this value will cause an error
diff --git a/src/test/ui/consts/const-eval/const_panic_libcore_main.stderr b/src/test/ui/consts/const-eval/const_panic_libcore_main.stderr
index df04a036811..22d173ad0c7 100644
--- a/src/test/ui/consts/const-eval/const_panic_libcore_main.stderr
+++ b/src/test/ui/consts/const-eval/const_panic_libcore_main.stderr
@@ -6,7 +6,7 @@ LL | const Z: () = panic!("cheese");
    |               |
    |               the evaluated program panicked at 'cheese', $DIR/const_panic_libcore_main.rs:9:15
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
 
 error: any use of this value will cause an error
diff --git a/src/test/ui/consts/const-eval/const_raw_ptr_ops.stderr b/src/test/ui/consts/const-eval/const_raw_ptr_ops.stderr
index 0d4c0b98879..a12575b3975 100644
--- a/src/test/ui/consts/const-eval/const_raw_ptr_ops.stderr
+++ b/src/test/ui/consts/const-eval/const_raw_ptr_ops.stderr
@@ -6,7 +6,7 @@ LL | const X: bool = unsafe { &1 as *const i32 == &2 as *const i32 };
    |                          |
    |                          "pointer arithmetic or comparison" needs an rfc before being allowed inside constants
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
 
 error: any use of this value will cause an error
   --> $DIR/const_raw_ptr_ops.rs:12:28
diff --git a/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.stderr b/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.stderr
index ac045f29b11..f330f9caaa2 100644
--- a/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.stderr
+++ b/src/test/ui/consts/const-eval/index_out_of_bounds_propagated.stderr
@@ -4,7 +4,7 @@ error: index out of bounds: the len is 1 but the index is 1
 LL |     array[1];
    |     ^^^^^^^^
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/consts/const-eval/issue-49296.stderr b/src/test/ui/consts/const-eval/issue-49296.stderr
index 5a59a8b2dff..7a4bba8daa7 100644
--- a/src/test/ui/consts/const-eval/issue-49296.stderr
+++ b/src/test/ui/consts/const-eval/issue-49296.stderr
@@ -6,7 +6,7 @@ LL | const X: u64 = *wat(42);
    |                |
    |                dangling pointer was dereferenced
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/consts/const-eval/issue-50814-2.stderr b/src/test/ui/consts/const-eval/issue-50814-2.stderr
index da560046c54..d68f72d36e2 100644
--- a/src/test/ui/consts/const-eval/issue-50814-2.stderr
+++ b/src/test/ui/consts/const-eval/issue-50814-2.stderr
@@ -6,7 +6,7 @@ LL |     const BAR: usize = [5, 6, 7][T::BOO];
    |                        |
    |                        index out of bounds: the len is 3 but the index is 42
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
 
 error[E0080]: evaluation of constant expression failed
   --> $DIR/issue-50814-2.rs:16:5
diff --git a/src/test/ui/consts/const-eval/issue-50814.stderr b/src/test/ui/consts/const-eval/issue-50814.stderr
index bc9443b26f5..707dfee7cd5 100644
--- a/src/test/ui/consts/const-eval/issue-50814.stderr
+++ b/src/test/ui/consts/const-eval/issue-50814.stderr
@@ -6,7 +6,7 @@ LL |     const MAX: u8 = A::MAX + B::MAX;
    |                     |
    |                     attempt to add with overflow
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
 
 error[E0080]: evaluation of constant expression failed
   --> $DIR/issue-50814.rs:17:5
diff --git a/src/test/ui/consts/const-eval/unused-broken-const.stderr b/src/test/ui/consts/const-eval/unused-broken-const.stderr
index e45ce65d8bb..a13cb877888 100644
--- a/src/test/ui/consts/const-eval/unused-broken-const.stderr
+++ b/src/test/ui/consts/const-eval/unused-broken-const.stderr
@@ -6,7 +6,7 @@ LL | const FOO: i32 = [][0];
    |                  |
    |                  index out of bounds: the len is 0 but the index is 0
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/consts/const-int-unchecked.stderr b/src/test/ui/consts/const-int-unchecked.stderr
index 0fa82008711..bf338e40107 100644
--- a/src/test/ui/consts/const-int-unchecked.stderr
+++ b/src/test/ui/consts/const-int-unchecked.stderr
@@ -6,7 +6,7 @@ LL | const SHL_U8: u8 = unsafe { intrinsics::unchecked_shl(5_u8, 8) };
    |                             |
    |                             Overflowing shift by 8 in unchecked_shl
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
 
 error: any use of this value will cause an error
   --> $DIR/const-int-unchecked.rs:16:31
diff --git a/src/test/ui/consts/const-len-underflow-separate-spans.stderr b/src/test/ui/consts/const-len-underflow-separate-spans.stderr
index ef4fa126dca..150d3eb525d 100644
--- a/src/test/ui/consts/const-len-underflow-separate-spans.stderr
+++ b/src/test/ui/consts/const-len-underflow-separate-spans.stderr
@@ -6,7 +6,7 @@ LL | const LEN: usize = ONE - TWO;
    |                    |
    |                    attempt to subtract with overflow
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
 
 error[E0080]: evaluation of constant value failed
   --> $DIR/const-len-underflow-separate-spans.rs:11:17
diff --git a/src/test/ui/consts/const-prop-ice.stderr b/src/test/ui/consts/const-prop-ice.stderr
index 8ec54b4438d..4b3880198bf 100644
--- a/src/test/ui/consts/const-prop-ice.stderr
+++ b/src/test/ui/consts/const-prop-ice.stderr
@@ -4,7 +4,7 @@ error: index out of bounds: the len is 3 but the index is 3
 LL |     [0; 3][3u64 as usize];
    |     ^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/consts/const-prop-ice2.stderr b/src/test/ui/consts/const-prop-ice2.stderr
index 68a7164da3d..dc17876eae4 100644
--- a/src/test/ui/consts/const-prop-ice2.stderr
+++ b/src/test/ui/consts/const-prop-ice2.stderr
@@ -4,7 +4,7 @@ error: index out of bounds: the len is 1 but the index is 1
 LL |     println!("{}", xs[Enum::One as usize]);
    |                    ^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/consts/const-slice-oob.stderr b/src/test/ui/consts/const-slice-oob.stderr
index c90cdbcb269..7e191a63361 100644
--- a/src/test/ui/consts/const-slice-oob.stderr
+++ b/src/test/ui/consts/const-slice-oob.stderr
@@ -6,7 +6,7 @@ LL | const BAR: u32 = FOO[5];
    |                  |
    |                  index out of bounds: the len is 3 but the index is 5
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/consts/dangling-alloc-id-ice.stderr b/src/test/ui/consts/dangling-alloc-id-ice.stderr
index 87f84480bf6..bac9f555d27 100644
--- a/src/test/ui/consts/dangling-alloc-id-ice.stderr
+++ b/src/test/ui/consts/dangling-alloc-id-ice.stderr
@@ -7,7 +7,7 @@ LL | |     unsafe { Foo { y: &y }.long_live_the_unit }
 LL | | };
    | |__^ type validation failed: encountered dangling pointer in final constant
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/consts/dangling_raw_ptr.stderr b/src/test/ui/consts/dangling_raw_ptr.stderr
index 0168c08f011..4748be37dff 100644
--- a/src/test/ui/consts/dangling_raw_ptr.stderr
+++ b/src/test/ui/consts/dangling_raw_ptr.stderr
@@ -7,7 +7,7 @@ LL | |     &x
 LL | | };
    | |__^ type validation failed: encountered dangling pointer in final constant
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/consts/uninhabited-const-issue-61744.stderr b/src/test/ui/consts/uninhabited-const-issue-61744.stderr
index 5c285543711..e317bdf103c 100644
--- a/src/test/ui/consts/uninhabited-const-issue-61744.stderr
+++ b/src/test/ui/consts/uninhabited-const-issue-61744.stderr
@@ -11,7 +11,7 @@ LL |     fake_type()
 LL |     const CONSTANT: i32 = unsafe { fake_type() };
    |     ---------------------------------------------
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
 
 error[E0080]: erroneous constant used
   --> $DIR/uninhabited-const-issue-61744.rs:18:10
diff --git a/src/test/ui/deprecation/atomic_initializers.stderr b/src/test/ui/deprecation/atomic_initializers.stderr
index b009ff9486b..16db00b6e85 100644
--- a/src/test/ui/deprecation/atomic_initializers.stderr
+++ b/src/test/ui/deprecation/atomic_initializers.stderr
@@ -4,5 +4,5 @@ warning: use of deprecated item 'std::sync::atomic::ATOMIC_ISIZE_INIT': the `new
 LL | static FOO: AtomicIsize = ATOMIC_ISIZE_INIT;
    |                           ^^^^^^^^^^^^^^^^^ help: replace the use of the deprecated item: `AtomicIsize::new(0)`
    |
-   = note: #[warn(deprecated)] on by default
+   = note: `#[warn(deprecated)]` on by default
 
diff --git a/src/test/ui/deprecation/deprecation-in-future.stderr b/src/test/ui/deprecation/deprecation-in-future.stderr
index 2284cfa8d68..4268680e9d9 100644
--- a/src/test/ui/deprecation/deprecation-in-future.stderr
+++ b/src/test/ui/deprecation/deprecation-in-future.stderr
@@ -4,5 +4,5 @@ warning: use of deprecated item 'deprecated_future': text
 LL |     deprecated_future(); // ok; deprecated_in_future only applies to rustc_deprecated
    |     ^^^^^^^^^^^^^^^^^
    |
-   = note: #[warn(deprecated)] on by default
+   = note: `#[warn(deprecated)]` on by default
 
diff --git a/src/test/ui/derives/deriving-meta-empty-trait-list.stderr b/src/test/ui/derives/deriving-meta-empty-trait-list.stderr
index 95c94ded3ea..b5d3670b5f3 100644
--- a/src/test/ui/derives/deriving-meta-empty-trait-list.stderr
+++ b/src/test/ui/derives/deriving-meta-empty-trait-list.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![deny(unused)]
    |         ^^^^^^
-   = note: #[deny(unused_attributes)] implied by #[deny(unused)]
+   = note: `#[deny(unused_attributes)]` implied by `#[deny(unused)]`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/did_you_mean/issue-31424.stderr b/src/test/ui/did_you_mean/issue-31424.stderr
index 147225f1be5..947ea6c24a3 100644
--- a/src/test/ui/did_you_mean/issue-31424.stderr
+++ b/src/test/ui/did_you_mean/issue-31424.stderr
@@ -16,7 +16,7 @@ LL |
 LL |         (&mut self).bar();
    |         ----------------- recursive call site
    |
-   = note: #[warn(unconditional_recursion)] on by default
+   = note: `#[warn(unconditional_recursion)]` on by default
    = help: a `loop` may express intention better if this is on purpose
 
 error[E0596]: cannot borrow `self` as mutable, as it is not declared as mutable
diff --git a/src/test/ui/editions/edition-extern-crate-allowed.stderr b/src/test/ui/editions/edition-extern-crate-allowed.stderr
index b675c13f75d..45b46794be2 100644
--- a/src/test/ui/editions/edition-extern-crate-allowed.stderr
+++ b/src/test/ui/editions/edition-extern-crate-allowed.stderr
@@ -9,5 +9,5 @@ note: lint level defined here
    |
 LL | #![warn(rust_2018_idioms)]
    |         ^^^^^^^^^^^^^^^^
-   = note: #[warn(unused_extern_crates)] implied by #[warn(rust_2018_idioms)]
+   = note: `#[warn(unused_extern_crates)]` implied by `#[warn(rust_2018_idioms)]`
 
diff --git a/src/test/ui/editions/edition-raw-pointer-method-2015.stderr b/src/test/ui/editions/edition-raw-pointer-method-2015.stderr
index 508d5df2a71..6a8861ba67b 100644
--- a/src/test/ui/editions/edition-raw-pointer-method-2015.stderr
+++ b/src/test/ui/editions/edition-raw-pointer-method-2015.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #[deny(warnings)]
    |        ^^^^^^^^
-   = note: #[deny(tyvar_behind_raw_pointer)] implied by #[deny(warnings)]
+   = note: `#[deny(tyvar_behind_raw_pointer)]` implied by `#[deny(warnings)]`
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
    = note: for more information, see issue #46906 <https://github.com/rust-lang/rust/issues/46906>
 
diff --git a/src/test/ui/error-codes/E0396-fixed.stderr b/src/test/ui/error-codes/E0396-fixed.stderr
index 4b7f1fa82c2..7222f87da24 100644
--- a/src/test/ui/error-codes/E0396-fixed.stderr
+++ b/src/test/ui/error-codes/E0396-fixed.stderr
@@ -6,7 +6,7 @@ LL | const VALUE: u8 = unsafe { *REG_ADDR };
    |                            |
    |                            a memory access tried to interpret some bytes as a pointer
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.stderr
index e03b7124ac8..f987cb97d1a 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.stderr
+++ b/src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.stderr
@@ -192,7 +192,7 @@ warning: the feature `rust1` has been stable since 1.0.0 and no longer requires
 LL | #![feature(rust1)]
    |            ^^^^^
    |
-   = note: #[warn(stable_features)] on by default
+   = note: `#[warn(stable_features)]` on by default
 
 warning: unused attribute
   --> $DIR/issue-43106-gating-of-builtin-attrs.rs:180:5
diff --git a/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr b/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr
index ef89a887fd4..4310a0c7d58 100644
--- a/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr
+++ b/src/test/ui/feature-gate/issue-43106-gating-of-inline.stderr
@@ -4,7 +4,7 @@ warning: attribute must be of the form `#[inline]` or `#[inline(always|never)]`
 LL |     #[inline = "2100"] fn f() { }
    |     ^^^^^^^^^^^^^^^^^^
    |
-   = note: #[warn(ill_formed_attribute_input)] on by default
+   = note: `#[warn(ill_formed_attribute_input)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #57571 <https://github.com/rust-lang/rust/issues/57571>
 
diff --git a/src/test/ui/feature-gates/feature-gate-default_type_parameter_fallback.stderr b/src/test/ui/feature-gates/feature-gate-default_type_parameter_fallback.stderr
index ac8cd101767..f13803b80f3 100644
--- a/src/test/ui/feature-gates/feature-gate-default_type_parameter_fallback.stderr
+++ b/src/test/ui/feature-gates/feature-gate-default_type_parameter_fallback.stderr
@@ -4,7 +4,7 @@ error: defaults for type parameters are only allowed in `struct`, `enum`, `type`
 LL | fn avg<T=i32>(_: T) {}
    |        ^
    |
-   = note: #[deny(invalid_type_param_default)] on by default
+   = note: `#[deny(invalid_type_param_default)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #36887 <https://github.com/rust-lang/rust/issues/36887>
 
diff --git a/src/test/ui/future-incompatible-lint-group.stderr b/src/test/ui/future-incompatible-lint-group.stderr
index 65c37e01eaa..24e3a077ae6 100644
--- a/src/test/ui/future-incompatible-lint-group.stderr
+++ b/src/test/ui/future-incompatible-lint-group.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![deny(future_incompatible)]
    |         ^^^^^^^^^^^^^^^^^^^
-   = note: #[deny(anonymous_parameters)] implied by #[deny(future_incompatible)]
+   = note: `#[deny(anonymous_parameters)]` implied by `#[deny(future_incompatible)]`
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
    = note: for more information, see issue #41686 <https://github.com/rust-lang/rust/issues/41686>
 
diff --git a/src/test/ui/hrtb/hrtb-perfect-forwarding.nll.stderr b/src/test/ui/hrtb/hrtb-perfect-forwarding.nll.stderr
index 0522fc45d68..6d1ef24b2dc 100644
--- a/src/test/ui/hrtb/hrtb-perfect-forwarding.nll.stderr
+++ b/src/test/ui/hrtb/hrtb-perfect-forwarding.nll.stderr
@@ -11,7 +11,7 @@ LL | |     no_hrtb(&mut t);
 LL | | }
    | |_^ cannot return without recursing
    |
-   = note: #[warn(unconditional_recursion)] on by default
+   = note: `#[warn(unconditional_recursion)]` on by default
    = help: a `loop` may express intention better if this is on purpose
 
 warning: function cannot return without recursing
diff --git a/src/test/ui/hygiene/dollar-crate-modern.stderr b/src/test/ui/hygiene/dollar-crate-modern.stderr
index 69bbc52ee0d..cd40df16ba7 100644
--- a/src/test/ui/hygiene/dollar-crate-modern.stderr
+++ b/src/test/ui/hygiene/dollar-crate-modern.stderr
@@ -4,5 +4,5 @@ warning: the feature `crate_in_paths` has been stable since 1.30.0 and no longer
 LL | #![feature(decl_macro, crate_in_paths)]
    |                        ^^^^^^^^^^^^^^
    |
-   = note: #[warn(stable_features)] on by default
+   = note: `#[warn(stable_features)]` on by default
 
diff --git a/src/test/ui/if/if-let.stderr b/src/test/ui/if/if-let.stderr
index 04bca1b76a0..f105098b74c 100644
--- a/src/test/ui/if/if-let.stderr
+++ b/src/test/ui/if/if-let.stderr
@@ -9,7 +9,7 @@ LL | |         println!("irrefutable pattern");
 LL | |     });
    | |_______- in this macro invocation
    |
-   = note: #[warn(irrefutable_let_patterns)] on by default
+   = note: `#[warn(irrefutable_let_patterns)]` on by default
 
 warning: irrefutable if-let pattern
   --> $DIR/if-let.rs:6:13
diff --git a/src/test/ui/imports/local-modularized-tricky-fail-3.stderr b/src/test/ui/imports/local-modularized-tricky-fail-3.stderr
index 6bece2b17ce..5272d2a319f 100644
--- a/src/test/ui/imports/local-modularized-tricky-fail-3.stderr
+++ b/src/test/ui/imports/local-modularized-tricky-fail-3.stderr
@@ -4,7 +4,7 @@ error: macro-expanded `macro_export` macros from the current crate cannot be ref
 LL |     use exported;
    |         ^^^^^^^^
    |
-   = note: #[deny(macro_expanded_macro_exports_accessed_by_absolute_paths)] on by default
+   = note: `#[deny(macro_expanded_macro_exports_accessed_by_absolute_paths)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #52234 <https://github.com/rust-lang/rust/issues/52234>
 note: the macro is defined here
diff --git a/src/test/ui/imports/unused-macro-use.stderr b/src/test/ui/imports/unused-macro-use.stderr
index 78683147f7b..b7fb532c67c 100644
--- a/src/test/ui/imports/unused-macro-use.stderr
+++ b/src/test/ui/imports/unused-macro-use.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![deny(unused)]
    |         ^^^^^^
-   = note: #[deny(unused_imports)] implied by #[deny(unused)]
+   = note: `#[deny(unused_imports)]` implied by `#[deny(unused)]`
 
 error: unused `#[macro_use]` import
   --> $DIR/unused-macro-use.rs:7:5
diff --git a/src/test/ui/imports/unused.stderr b/src/test/ui/imports/unused.stderr
index 259ed958696..0366b52ef6a 100644
--- a/src/test/ui/imports/unused.stderr
+++ b/src/test/ui/imports/unused.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![deny(unused)]
    |         ^^^^^^
-   = note: #[deny(unused_imports)] implied by #[deny(unused)]
+   = note: `#[deny(unused_imports)]` implied by `#[deny(unused)]`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/inference/inference-variable-behind-raw-pointer.stderr b/src/test/ui/inference/inference-variable-behind-raw-pointer.stderr
index 52cf68ae2a6..b5b885e233f 100644
--- a/src/test/ui/inference/inference-variable-behind-raw-pointer.stderr
+++ b/src/test/ui/inference/inference-variable-behind-raw-pointer.stderr
@@ -4,7 +4,7 @@ warning: type annotations needed
 LL |     if data.is_null() {}
    |             ^^^^^^^
    |
-   = note: #[warn(tyvar_behind_raw_pointer)] on by default
+   = note: `#[warn(tyvar_behind_raw_pointer)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
    = note: for more information, see issue #46906 <https://github.com/rust-lang/rust/issues/46906>
 
diff --git a/src/test/ui/inference/inference_unstable.stderr b/src/test/ui/inference/inference_unstable.stderr
index 6c3d8f7ccf3..1f5cc8b13fb 100644
--- a/src/test/ui/inference/inference_unstable.stderr
+++ b/src/test/ui/inference/inference_unstable.stderr
@@ -4,7 +4,7 @@ warning: a method with this name may be added to the standard library in the fut
 LL |     assert_eq!('x'.ipu_flatten(), 1);
    |                    ^^^^^^^^^^^
    |
-   = note: #[warn(unstable_name_collisions)] on by default
+   = note: `#[warn(unstable_name_collisions)]` on by default
    = warning: once this method is added to the standard library, the ambiguity may cause an error or change in behavior!
    = note: for more information, see issue #48919 <https://github.com/rust-lang/rust/issues/48919>
    = help: call with fully qualified syntax `inference_unstable_itertools::IpuItertools::ipu_flatten(...)` to keep using the current method
diff --git a/src/test/ui/invalid/invalid-crate-type.stderr b/src/test/ui/invalid/invalid-crate-type.stderr
index 030dc96c6d6..59d5d7bc9bb 100644
--- a/src/test/ui/invalid/invalid-crate-type.stderr
+++ b/src/test/ui/invalid/invalid-crate-type.stderr
@@ -4,7 +4,7 @@ error: invalid `crate_type` value
 LL | #![crate_type="foo"]
    |               ^^^^^
    |
-   = note: #[deny(unknown_crate_types)] on by default
+   = note: `#[deny(unknown_crate_types)]` on by default
 
 error: invalid `crate_type` value
   --> $DIR/invalid-crate-type.rs:6:15
diff --git a/src/test/ui/issues/issue-16250.stderr b/src/test/ui/issues/issue-16250.stderr
index 142d8e21532..f3686e82b05 100644
--- a/src/test/ui/issues/issue-16250.stderr
+++ b/src/test/ui/issues/issue-16250.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![deny(warnings)]
    |         ^^^^^^^^
-   = note: #[deny(improper_ctypes)] implied by #[deny(warnings)]
+   = note: `#[deny(improper_ctypes)]` implied by `#[deny(warnings)]`
    = help: consider adding a `#[repr(C)]` or `#[repr(transparent)]` attribute to this struct
 note: type defined here
   --> $DIR/issue-16250.rs:3:1
diff --git a/src/test/ui/issues/issue-17718-const-naming.stderr b/src/test/ui/issues/issue-17718-const-naming.stderr
index b92acecb83e..1fe1821292c 100644
--- a/src/test/ui/issues/issue-17718-const-naming.stderr
+++ b/src/test/ui/issues/issue-17718-const-naming.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![deny(warnings)]
    |         ^^^^^^^^
-   = note: #[deny(dead_code)] implied by #[deny(warnings)]
+   = note: `#[deny(dead_code)]` implied by `#[deny(warnings)]`
 
 error: constant `foo` should have an upper case name
   --> $DIR/issue-17718-const-naming.rs:4:7
@@ -22,7 +22,7 @@ note: lint level defined here
    |
 LL | #![deny(warnings)]
    |         ^^^^^^^^
-   = note: #[deny(non_upper_case_globals)] implied by #[deny(warnings)]
+   = note: `#[deny(non_upper_case_globals)]` implied by `#[deny(warnings)]`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-27042.stderr b/src/test/ui/issues/issue-27042.stderr
index c67b8ad7381..4beb752854b 100644
--- a/src/test/ui/issues/issue-27042.stderr
+++ b/src/test/ui/issues/issue-27042.stderr
@@ -6,7 +6,7 @@ LL | |
 LL | |         while true { break }; // but here we cite the whole loop
    | |____________________________^ help: use `loop`
    |
-   = note: #[warn(while_true)] on by default
+   = note: `#[warn(while_true)]` on by default
 
 error[E0308]: mismatched types
   --> $DIR/issue-27042.rs:6:16
diff --git a/src/test/ui/issues/issue-30079.stderr b/src/test/ui/issues/issue-30079.stderr
index 57ca5721544..6fc8b810745 100644
--- a/src/test/ui/issues/issue-30079.stderr
+++ b/src/test/ui/issues/issue-30079.stderr
@@ -4,7 +4,7 @@ warning: private type `m1::Priv` in public interface (error E0446)
 LL |         pub fn f(_: Priv) {}
    |         ^^^^^^^^^^^^^^^^^^^^
    |
-   = note: #[warn(private_in_public)] on by default
+   = note: `#[warn(private_in_public)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
 
diff --git a/src/test/ui/issues/issue-30730.stderr b/src/test/ui/issues/issue-30730.stderr
index 0a901076f46..fcbab77b007 100644
--- a/src/test/ui/issues/issue-30730.stderr
+++ b/src/test/ui/issues/issue-30730.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![deny(warnings)]
    |         ^^^^^^^^
-   = note: #[deny(unused_imports)] implied by #[deny(warnings)]
+   = note: `#[deny(unused_imports)]` implied by `#[deny(warnings)]`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-32995-2.stderr b/src/test/ui/issues/issue-32995-2.stderr
index 104b76cba2d..4a580b09bf3 100644
--- a/src/test/ui/issues/issue-32995-2.stderr
+++ b/src/test/ui/issues/issue-32995-2.stderr
@@ -4,7 +4,7 @@ error: parenthesized type parameters may only be used with a `Fn` trait
 LL |     { fn f<X: ::std::marker()::Send>() {} }
    |                            ^^
    |
-   = note: #[deny(parenthesized_params_in_types_and_modules)] on by default
+   = note: `#[deny(parenthesized_params_in_types_and_modules)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #42238 <https://github.com/rust-lang/rust/issues/42238>
 
diff --git a/src/test/ui/issues/issue-32995.stderr b/src/test/ui/issues/issue-32995.stderr
index f97d86f6522..59d93ece067 100644
--- a/src/test/ui/issues/issue-32995.stderr
+++ b/src/test/ui/issues/issue-32995.stderr
@@ -4,7 +4,7 @@ error: parenthesized type parameters may only be used with a `Fn` trait
 LL |     let x: usize() = 1;
    |                 ^^
    |
-   = note: #[deny(parenthesized_params_in_types_and_modules)] on by default
+   = note: `#[deny(parenthesized_params_in_types_and_modules)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #42238 <https://github.com/rust-lang/rust/issues/42238>
 
diff --git a/src/test/ui/issues/issue-37515.stderr b/src/test/ui/issues/issue-37515.stderr
index 1476d17cdc6..f0840959698 100644
--- a/src/test/ui/issues/issue-37515.stderr
+++ b/src/test/ui/issues/issue-37515.stderr
@@ -9,5 +9,5 @@ note: lint level defined here
    |
 LL | #![warn(unused)]
    |         ^^^^^^
-   = note: #[warn(dead_code)] implied by #[warn(unused)]
+   = note: `#[warn(dead_code)]` implied by `#[warn(unused)]`
 
diff --git a/src/test/ui/issues/issue-38715.stderr b/src/test/ui/issues/issue-38715.stderr
index 34e08bfc93a..02b96d2d244 100644
--- a/src/test/ui/issues/issue-38715.stderr
+++ b/src/test/ui/issues/issue-38715.stderr
@@ -4,7 +4,7 @@ error: a macro named `foo` has already been exported
 LL | macro_rules! foo { () => {} }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `foo` already exported
    |
-   = note: #[deny(duplicate_macro_exports)] on by default
+   = note: `#[deny(duplicate_macro_exports)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
    = note: for more information, see issue #35896 <https://github.com/rust-lang/rust/issues/35896>
 note: previous macro export is now shadowed
diff --git a/src/test/ui/issues/issue-39404.stderr b/src/test/ui/issues/issue-39404.stderr
index bffea49362a..d2f2a823c2a 100644
--- a/src/test/ui/issues/issue-39404.stderr
+++ b/src/test/ui/issues/issue-39404.stderr
@@ -4,7 +4,7 @@ error: missing fragment specifier
 LL | macro_rules! m { ($i) => {} }
    |                   ^^
    |
-   = note: #[deny(missing_fragment_specifier)] on by default
+   = note: `#[deny(missing_fragment_specifier)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #40107 <https://github.com/rust-lang/rust/issues/40107>
 
diff --git a/src/test/ui/issues/issue-43105.stderr b/src/test/ui/issues/issue-43105.stderr
index 378fbe6d5c4..e3609c57dce 100644
--- a/src/test/ui/issues/issue-43105.stderr
+++ b/src/test/ui/issues/issue-43105.stderr
@@ -12,7 +12,7 @@ LL | const NUM: u8 = xyz();
    |                 |
    |                 calling non-const function `xyz`
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
 
 error: could not evaluate constant pattern
   --> $DIR/issue-43105.rs:9:9
diff --git a/src/test/ui/issues/issue-45562.stderr b/src/test/ui/issues/issue-45562.stderr
index b97b9cd6727..e6e33aa85c3 100644
--- a/src/test/ui/issues/issue-45562.stderr
+++ b/src/test/ui/issues/issue-45562.stderr
@@ -6,7 +6,7 @@ LL | #[no_mangle] pub const RAH: usize = 5;
    |              |
    |              help: try a static value: `pub static`
    |
-   = note: #[deny(no_mangle_const_items)] on by default
+   = note: `#[deny(no_mangle_const_items)]` on by default
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/issues/issue-54348.stderr b/src/test/ui/issues/issue-54348.stderr
index e39a1cb20cf..fa77bd6fd77 100644
--- a/src/test/ui/issues/issue-54348.stderr
+++ b/src/test/ui/issues/issue-54348.stderr
@@ -4,7 +4,7 @@ error: index out of bounds: the len is 1 but the index is 1
 LL |     [1][1.5 as usize];
    |     ^^^^^^^^^^^^^^^^^
    |
-   = note: #[deny(const_err)] on by default
+   = note: `#[deny(const_err)]` on by default
 
 error: index out of bounds: the len is 1 but the index is 1
   --> $DIR/issue-54348.rs:4:5
diff --git a/src/test/ui/issues/issue-60622.stderr b/src/test/ui/issues/issue-60622.stderr
index 0c337c315f1..da0ae1541bb 100644
--- a/src/test/ui/issues/issue-60622.stderr
+++ b/src/test/ui/issues/issue-60622.stderr
@@ -12,7 +12,7 @@ note: lint level defined here
    |
 LL | #![deny(warnings)]
    |         ^^^^^^^^
-   = note: #[deny(late_bound_lifetime_arguments)] implied by #[deny(warnings)]
+   = note: `#[deny(late_bound_lifetime_arguments)]` implied by `#[deny(warnings)]`
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #42868 <https://github.com/rust-lang/rust/issues/42868>
 
diff --git a/src/test/ui/issues/issue-8727.stderr b/src/test/ui/issues/issue-8727.stderr
index a7d020cb675..df01f42ce26 100644
--- a/src/test/ui/issues/issue-8727.stderr
+++ b/src/test/ui/issues/issue-8727.stderr
@@ -6,7 +6,7 @@ LL | fn generic<T>() {
 LL |     generic::<Option<T>>();
    |     ---------------------- recursive call site
    |
-   = note: #[warn(unconditional_recursion)] on by default
+   = note: `#[warn(unconditional_recursion)]` on by default
    = help: a `loop` may express intention better if this is on purpose
 
 error: reached the recursion limit while instantiating `generic::<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<std::option::Option<i32>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>`
diff --git a/src/test/ui/lint/deny-overflowing-literals.stderr b/src/test/ui/lint/deny-overflowing-literals.stderr
index c97872b5222..7f59495023e 100644
--- a/src/test/ui/lint/deny-overflowing-literals.stderr
+++ b/src/test/ui/lint/deny-overflowing-literals.stderr
@@ -4,7 +4,7 @@ error: literal out of range for `u8`
 LL |     let x: u8 = 256;
    |                 ^^^
    |
-   = note: #[deny(overflowing_literals)] on by default
+   = note: `#[deny(overflowing_literals)]` on by default
 
 error: range endpoint is out of range for `u8`
   --> $DIR/deny-overflowing-literals.rs:5:14
diff --git a/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.stderr b/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.stderr
index 8fd98e0a3db..a0b34d220c8 100644
--- a/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.stderr
+++ b/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![warn(unused)] // UI tests pass `-A unused` (#43896)
    |         ^^^^^^
-   = note: #[warn(unused_variables)] implied by #[warn(unused)]
+   = note: `#[warn(unused_variables)]` implied by `#[warn(unused)]`
 
 warning: unused variable: `mut_unused_var`
   --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:33:13
@@ -54,7 +54,7 @@ note: lint level defined here
    |
 LL | #![warn(unused)] // UI tests pass `-A unused` (#43896)
    |         ^^^^^^
-   = note: #[warn(unused_assignments)] implied by #[warn(unused)]
+   = note: `#[warn(unused_assignments)]` implied by `#[warn(unused)]`
    = help: maybe it is overwritten before being read?
 
 warning: unused variable: `fire`
@@ -112,7 +112,7 @@ note: lint level defined here
    |
 LL | #![warn(unused)] // UI tests pass `-A unused` (#43896)
    |         ^^^^^^
-   = note: #[warn(unused_mut)] implied by #[warn(unused)]
+   = note: `#[warn(unused_mut)]` implied by `#[warn(unused)]`
 
 warning: variable does not need to be mutable
   --> $DIR/issue-47390-unused-variable-in-struct-pattern.rs:35:10
diff --git a/src/test/ui/lint/issue-54180-unused-ref-field.stderr b/src/test/ui/lint/issue-54180-unused-ref-field.stderr
index 9f47554a1a6..817d9a46e83 100644
--- a/src/test/ui/lint/issue-54180-unused-ref-field.stderr
+++ b/src/test/ui/lint/issue-54180-unused-ref-field.stderr
@@ -11,7 +11,7 @@ note: lint level defined here
    |
 LL | #![deny(unused)]
    |         ^^^^^^
-   = note: #[deny(unused_variables)] implied by #[deny(unused)]
+   = note: `#[deny(unused_variables)]` implied by `#[deny(unused)]`
 
 error: unused variable: `x`
   --> $DIR/issue-54180-unused-ref-field.rs:29:45
diff --git a/src/test/ui/lint/lint-change-warnings.stderr b/src/test/ui/lint/lint-change-warnings.stderr
index c4b8ab5fc18..336cb7ea84f 100644
--- a/src/test/ui/lint/lint-change-warnings.stderr
+++ b/src/test/ui/lint/lint-change-warnings.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![deny(warnings)]
    |         ^^^^^^^^
-   = note: #[deny(while_true)] implied by #[deny(warnings)]
+   = note: `#[deny(while_true)]` implied by `#[deny(warnings)]`
 
 warning: denote infinite loops with `loop { ... }`
   --> $DIR/lint-change-warnings.rs:15:5
@@ -17,7 +17,7 @@ warning: denote infinite loops with `loop { ... }`
 LL |     while true {}
    |     ^^^^^^^^^^ help: use `loop`
    |
-   = note: #[warn(while_true)] on by default
+   = note: `#[warn(while_true)]` on by default
 
 error: denote infinite loops with `loop { ... }`
   --> $DIR/lint-change-warnings.rs:20:5
@@ -30,7 +30,7 @@ note: lint level defined here
    |
 LL | #[forbid(warnings)]
    |          ^^^^^^^^
-   = note: #[forbid(while_true)] implied by #[forbid(warnings)]
+   = note: `#[forbid(while_true)]` implied by `#[forbid(warnings)]`
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/lint/lint-group-nonstandard-style.stderr b/src/test/ui/lint/lint-group-nonstandard-style.stderr
index a365204f12a..1cc973d32c2 100644
--- a/src/test/ui/lint/lint-group-nonstandard-style.stderr
+++ b/src/test/ui/lint/lint-group-nonstandard-style.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL |         #![warn(nonstandard_style)]
    |                 ^^^^^^^^^^^^^^^^^
-   = note: #[warn(non_camel_case_types)] implied by #[warn(nonstandard_style)]
+   = note: `#[warn(non_camel_case_types)]` implied by `#[warn(nonstandard_style)]`
 
 error: function `CamelCase` should have a snake case name
   --> $DIR/lint-group-nonstandard-style.rs:4:4
@@ -22,7 +22,7 @@ note: lint level defined here
    |
 LL | #![deny(nonstandard_style)]
    |         ^^^^^^^^^^^^^^^^^
-   = note: #[deny(non_snake_case)] implied by #[deny(nonstandard_style)]
+   = note: `#[deny(non_snake_case)]` implied by `#[deny(nonstandard_style)]`
 
 error: function `CamelCase` should have a snake case name
   --> $DIR/lint-group-nonstandard-style.rs:12:12
@@ -35,7 +35,7 @@ note: lint level defined here
    |
 LL |     #[forbid(nonstandard_style)]
    |              ^^^^^^^^^^^^^^^^^
-   = note: #[forbid(non_snake_case)] implied by #[forbid(nonstandard_style)]
+   = note: `#[forbid(non_snake_case)]` implied by `#[forbid(nonstandard_style)]`
 
 error: static variable `bad` should have an upper case name
   --> $DIR/lint-group-nonstandard-style.rs:14:16
@@ -48,7 +48,7 @@ note: lint level defined here
    |
 LL |     #[forbid(nonstandard_style)]
    |              ^^^^^^^^^^^^^^^^^
-   = note: #[forbid(non_upper_case_globals)] implied by #[forbid(nonstandard_style)]
+   = note: `#[forbid(non_upper_case_globals)]` implied by `#[forbid(nonstandard_style)]`
 
 warning: function `CamelCase` should have a snake case name
   --> $DIR/lint-group-nonstandard-style.rs:20:12
@@ -61,7 +61,7 @@ note: lint level defined here
    |
 LL |         #![warn(nonstandard_style)]
    |                 ^^^^^^^^^^^^^^^^^
-   = note: #[warn(non_snake_case)] implied by #[warn(nonstandard_style)]
+   = note: `#[warn(non_snake_case)]` implied by `#[warn(nonstandard_style)]`
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/lint/lint-incoherent-auto-trait-objects.stderr b/src/test/ui/lint/lint-incoherent-auto-trait-objects.stderr
index 448cc953d40..5308bba440e 100644
--- a/src/test/ui/lint/lint-incoherent-auto-trait-objects.stderr
+++ b/src/test/ui/lint/lint-incoherent-auto-trait-objects.stderr
@@ -7,7 +7,7 @@ LL |
 LL | impl Foo for dyn Send + Send {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(dyn std::marker::Send + 'static)`
    |
-   = note: #[deny(order_dependent_trait_objects)] on by default
+   = note: `#[deny(order_dependent_trait_objects)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #56484 <https://github.com/rust-lang/rust/issues/56484>
 
diff --git a/src/test/ui/lint/lint-output-format-2.stderr b/src/test/ui/lint/lint-output-format-2.stderr
index f4e6b062034..fcaf01488ab 100644
--- a/src/test/ui/lint/lint-output-format-2.stderr
+++ b/src/test/ui/lint/lint-output-format-2.stderr
@@ -4,7 +4,7 @@ warning: use of deprecated item 'lint_output_format::foo': text
 LL | use lint_output_format::{foo, bar};
    |                          ^^^
    |
-   = note: #[warn(deprecated)] on by default
+   = note: `#[warn(deprecated)]` on by default
 
 warning: use of deprecated item 'lint_output_format::foo': text
   --> $DIR/lint-output-format-2.rs:12:14
diff --git a/src/test/ui/lint/lint-removed-cmdline.stderr b/src/test/ui/lint/lint-removed-cmdline.stderr
index d46ef6b9237..69b0d2675c2 100644
--- a/src/test/ui/lint/lint-removed-cmdline.stderr
+++ b/src/test/ui/lint/lint-removed-cmdline.stderr
@@ -13,7 +13,7 @@ note: lint level defined here
    |
 LL | #[deny(warnings)]
    |        ^^^^^^^^
-   = note: #[deny(unused_variables)] implied by #[deny(warnings)]
+   = note: `#[deny(unused_variables)]` implied by `#[deny(warnings)]`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/lint/lint-removed.stderr b/src/test/ui/lint/lint-removed.stderr
index cde494f22f0..060ba31bced 100644
--- a/src/test/ui/lint/lint-removed.stderr
+++ b/src/test/ui/lint/lint-removed.stderr
@@ -4,7 +4,7 @@ warning: lint `raw_pointer_derive` has been removed: `using derive with raw poin
 LL | #[deny(raw_pointer_derive)]
    |        ^^^^^^^^^^^^^^^^^^
    |
-   = note: #[warn(renamed_and_removed_lints)] on by default
+   = note: `#[warn(renamed_and_removed_lints)]` on by default
 
 error: unused variable: `unused`
   --> $DIR/lint-removed.rs:8:17
diff --git a/src/test/ui/lint/lint-renamed-allow.stderr b/src/test/ui/lint/lint-renamed-allow.stderr
index 383a800b54a..1d984cb8287 100644
--- a/src/test/ui/lint/lint-renamed-allow.stderr
+++ b/src/test/ui/lint/lint-renamed-allow.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #[deny(unused)]
    |        ^^^^^^
-   = note: #[deny(unused_variables)] implied by #[deny(unused)]
+   = note: `#[deny(unused_variables)]` implied by `#[deny(unused)]`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/lint/lint-renamed-cmdline.stderr b/src/test/ui/lint/lint-renamed-cmdline.stderr
index 6247ee0aff8..c978981a5c2 100644
--- a/src/test/ui/lint/lint-renamed-cmdline.stderr
+++ b/src/test/ui/lint/lint-renamed-cmdline.stderr
@@ -13,7 +13,7 @@ note: lint level defined here
    |
 LL | #[deny(unused)]
    |        ^^^^^^
-   = note: #[deny(unused_variables)] implied by #[deny(unused)]
+   = note: `#[deny(unused_variables)]` implied by `#[deny(unused)]`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/lint/lint-renamed.stderr b/src/test/ui/lint/lint-renamed.stderr
index 2174b22ffb9..ba8eadf23ac 100644
--- a/src/test/ui/lint/lint-renamed.stderr
+++ b/src/test/ui/lint/lint-renamed.stderr
@@ -4,7 +4,7 @@ warning: lint `bare_trait_object` has been renamed to `bare_trait_objects`
 LL | #[deny(bare_trait_object)]
    |        ^^^^^^^^^^^^^^^^^ help: use the new name: `bare_trait_objects`
    |
-   = note: #[warn(renamed_and_removed_lints)] on by default
+   = note: `#[warn(renamed_and_removed_lints)]` on by default
 
 error: unused variable: `unused`
   --> $DIR/lint-renamed.rs:4:17
@@ -17,7 +17,7 @@ note: lint level defined here
    |
 LL | #[deny(unused)]
    |        ^^^^^^
-   = note: #[deny(unused_variables)] implied by #[deny(unused)]
+   = note: `#[deny(unused_variables)]` implied by `#[deny(unused)]`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/lint/lint-unnecessary-parens.stderr b/src/test/ui/lint/lint-unnecessary-parens.stderr
index 05ecbfdf4fa..83b247a4a60 100644
--- a/src/test/ui/lint/lint-unnecessary-parens.stderr
+++ b/src/test/ui/lint/lint-unnecessary-parens.stderr
@@ -40,7 +40,7 @@ warning: denote infinite loops with `loop { ... }`
 LL |     while (true) {}
    |     ^^^^^^^^^^^^ help: use `loop`
    |
-   = note: #[warn(while_true)] on by default
+   = note: `#[warn(while_true)]` on by default
 
 error: unnecessary parentheses around `match` head expression
   --> $DIR/lint-unnecessary-parens.rs:23:11
diff --git a/src/test/ui/lint/lint-uppercase-variables.stderr b/src/test/ui/lint/lint-uppercase-variables.stderr
index 40c13231c18..9ea3795f89e 100644
--- a/src/test/ui/lint/lint-uppercase-variables.stderr
+++ b/src/test/ui/lint/lint-uppercase-variables.stderr
@@ -15,7 +15,7 @@ note: lint level defined here
    |
 LL | #![warn(unused)]
    |         ^^^^^^
-   = note: #[warn(unused_variables)] implied by #[warn(unused)]
+   = note: `#[warn(unused_variables)]` implied by `#[warn(unused)]`
 
 error: structure field `X` should have a snake case name
   --> $DIR/lint-uppercase-variables.rs:10:5
diff --git a/src/test/ui/lint/not_found.stderr b/src/test/ui/lint/not_found.stderr
index 266cf10af82..70d49a4e69c 100644
--- a/src/test/ui/lint/not_found.stderr
+++ b/src/test/ui/lint/not_found.stderr
@@ -4,7 +4,7 @@ warning: unknown lint: `FOO_BAR`
 LL | #[allow(FOO_BAR)]
    |         ^^^^^^^
    |
-   = note: #[warn(unknown_lints)] on by default
+   = note: `#[warn(unknown_lints)]` on by default
 
 warning: unknown lint: `DEAD_CODE`
   --> $DIR/not_found.rs:8:8
diff --git a/src/test/ui/lint/reasons-erroneous.rs b/src/test/ui/lint/reasons-erroneous.rs
index 84db885ac09..21c2ddd5ef7 100644
--- a/src/test/ui/lint/reasons-erroneous.rs
+++ b/src/test/ui/lint/reasons-erroneous.rs
@@ -23,6 +23,6 @@
 //~| NOTE reason in lint attribute must come last
 #![warn(missing_copy_implementations, reason)]
 //~^ WARN unknown lint
-//~| NOTE #[warn(unknown_lints)] on by default
+//~| NOTE `#[warn(unknown_lints)]` on by default
 
 fn main() {}
diff --git a/src/test/ui/lint/reasons-erroneous.stderr b/src/test/ui/lint/reasons-erroneous.stderr
index ff4a0f36bbd..3f925f19ef1 100644
--- a/src/test/ui/lint/reasons-erroneous.stderr
+++ b/src/test/ui/lint/reasons-erroneous.stderr
@@ -46,7 +46,7 @@ warning: unknown lint: `reason`
 LL | #![warn(missing_copy_implementations, reason)]
    |                                       ^^^^^^
    |
-   = note: #[warn(unknown_lints)] on by default
+   = note: `#[warn(unknown_lints)]` on by default
 
 error: aborting due to 7 previous errors
 
diff --git a/src/test/ui/lint/reasons.stderr b/src/test/ui/lint/reasons.stderr
index 3bb1480a301..cb5f4ddf47b 100644
--- a/src/test/ui/lint/reasons.stderr
+++ b/src/test/ui/lint/reasons.stderr
@@ -24,5 +24,5 @@ note: lint level defined here
    |
 LL |     nonstandard_style,
    |     ^^^^^^^^^^^^^^^^^
-   = note: #[warn(non_snake_case)] implied by #[warn(nonstandard_style)]
+   = note: `#[warn(non_snake_case)]` implied by `#[warn(nonstandard_style)]`
 
diff --git a/src/test/ui/lint/suggestions.stderr b/src/test/ui/lint/suggestions.stderr
index de7c1fb8986..eb1e95dcdc5 100644
--- a/src/test/ui/lint/suggestions.stderr
+++ b/src/test/ui/lint/suggestions.stderr
@@ -4,7 +4,7 @@ warning: denote infinite loops with `loop { ... }`
 LL |     while true {
    |     ^^^^^^^^^^ help: use `loop`
    |
-   = note: #[warn(while_true)] on by default
+   = note: `#[warn(while_true)]` on by default
 
 warning: unnecessary parentheses around assigned value
   --> $DIR/suggestions.rs:49:31
@@ -24,7 +24,7 @@ warning: use of deprecated attribute `no_debug`: the `#[no_debug]` attribute was
 LL | #[no_debug] // should suggest removal of deprecated attribute
    | ^^^^^^^^^^^ help: remove this attribute
    |
-   = note: #[warn(deprecated)] on by default
+   = note: `#[warn(deprecated)]` on by default
 
 warning: variable does not need to be mutable
   --> $DIR/suggestions.rs:49:13
@@ -60,7 +60,7 @@ LL | #[no_mangle] const DISCOVERY: usize = 1;
    |              |
    |              help: try a static value: `pub static`
    |
-   = note: #[deny(no_mangle_const_items)] on by default
+   = note: `#[deny(no_mangle_const_items)]` on by default
 
 warning: functions generic over types or consts must be mangled
   --> $DIR/suggestions.rs:12:1
@@ -71,7 +71,7 @@ LL |
 LL | pub fn defiant<T>(_t: T) {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: #[warn(no_mangle_generic_items)] on by default
+   = note: `#[warn(no_mangle_generic_items)]` on by default
 
 warning: the `warp_factor:` in this pattern is redundant
   --> $DIR/suggestions.rs:61:23
@@ -81,7 +81,7 @@ LL |             Equinox { warp_factor: warp_factor } => {}
    |                       |
    |                       help: remove this
    |
-   = note: #[warn(non_shorthand_field_patterns)] on by default
+   = note: `#[warn(non_shorthand_field_patterns)]` on by default
 
 error: const items should never be #[no_mangle]
   --> $DIR/suggestions.rs:22:18
diff --git a/src/test/ui/liveness/liveness-move-in-while.stderr b/src/test/ui/liveness/liveness-move-in-while.stderr
index bbf5e50f1e0..8350f2708ea 100644
--- a/src/test/ui/liveness/liveness-move-in-while.stderr
+++ b/src/test/ui/liveness/liveness-move-in-while.stderr
@@ -4,7 +4,7 @@ warning: denote infinite loops with `loop { ... }`
 LL |         while true { while true { while true { x = y; x.clone(); } } }
    |         ^^^^^^^^^^ help: use `loop`
    |
-   = note: #[warn(while_true)] on by default
+   = note: `#[warn(while_true)]` on by default
 
 warning: denote infinite loops with `loop { ... }`
   --> $DIR/liveness-move-in-while.rs:8:22
diff --git a/src/test/ui/liveness/liveness-unused.stderr b/src/test/ui/liveness/liveness-unused.stderr
index d6077111f71..40a677c08f2 100644
--- a/src/test/ui/liveness/liveness-unused.stderr
+++ b/src/test/ui/liveness/liveness-unused.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![warn(unused)]
    |         ^^^^^^
-   = note: #[warn(unreachable_code)] implied by #[warn(unused)]
+   = note: `#[warn(unreachable_code)]` implied by `#[warn(unused)]`
 
 error: unused variable: `x`
   --> $DIR/liveness-unused.rs:8:7
diff --git a/src/test/ui/loops/loop-break-value.stderr b/src/test/ui/loops/loop-break-value.stderr
index f458c88ea48..1e167905ec8 100644
--- a/src/test/ui/loops/loop-break-value.stderr
+++ b/src/test/ui/loops/loop-break-value.stderr
@@ -4,7 +4,7 @@ warning: denote infinite loops with `loop { ... }`
 LL |     'while_loop: while true {
    |     ^^^^^^^^^^^^^^^^^^^^^^^ help: use `loop`
    |
-   = note: #[warn(while_true)] on by default
+   = note: `#[warn(while_true)]` on by default
 
 error[E0571]: `break` with value from a `while` loop
   --> $DIR/loop-break-value.rs:28:9
diff --git a/src/test/ui/macros/macro-deprecation.stderr b/src/test/ui/macros/macro-deprecation.stderr
index 4c2ad7d2fe9..75915b90910 100644
--- a/src/test/ui/macros/macro-deprecation.stderr
+++ b/src/test/ui/macros/macro-deprecation.stderr
@@ -4,7 +4,7 @@ warning: use of deprecated item 'local_deprecated': local deprecation note
 LL |     local_deprecated!();
    |     ^^^^^^^^^^^^^^^^
    |
-   = note: #[warn(deprecated)] on by default
+   = note: `#[warn(deprecated)]` on by default
 
 warning: use of deprecated item 'deprecated_macro': deprecation note
   --> $DIR/macro-deprecation.rs:12:5
diff --git a/src/test/ui/macros/macro-path-prelude-pass.stderr b/src/test/ui/macros/macro-path-prelude-pass.stderr
index 3744e0198b4..c6e7fd77cd9 100644
--- a/src/test/ui/macros/macro-path-prelude-pass.stderr
+++ b/src/test/ui/macros/macro-path-prelude-pass.stderr
@@ -4,5 +4,5 @@ warning: the feature `extern_prelude` has been stable since 1.30.0 and no longer
 LL | #![feature(extern_prelude)]
    |            ^^^^^^^^^^^^^^
    |
-   = note: #[warn(stable_features)] on by default
+   = note: `#[warn(stable_features)]` on by default
 
diff --git a/src/test/ui/macros/macro-stability.stderr b/src/test/ui/macros/macro-stability.stderr
index 21c48bfe5e7..d357314d84c 100644
--- a/src/test/ui/macros/macro-stability.stderr
+++ b/src/test/ui/macros/macro-stability.stderr
@@ -28,7 +28,7 @@ warning: use of deprecated item 'deprecated_macro': deprecation reason
 LL |     deprecated_macro!();
    |     ^^^^^^^^^^^^^^^^
    |
-   = note: #[warn(deprecated)] on by default
+   = note: `#[warn(deprecated)]` on by default
 
 warning: use of deprecated item 'local_deprecated': local deprecation reason
   --> $DIR/macro-stability.rs:26:5
diff --git a/src/test/ui/malformed/malformed-regressions.stderr b/src/test/ui/malformed/malformed-regressions.stderr
index 99a87f0c3aa..eebb6f0623f 100644
--- a/src/test/ui/malformed/malformed-regressions.stderr
+++ b/src/test/ui/malformed/malformed-regressions.stderr
@@ -4,7 +4,7 @@ warning: attribute must be of the form `#[doc(hidden|inline|...)]` or `#[doc = "
 LL | #[doc]
    | ^^^^^^
    |
-   = note: #[warn(ill_formed_attribute_input)] on by default
+   = note: `#[warn(ill_formed_attribute_input)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #57571 <https://github.com/rust-lang/rust/issues/57571>
 
diff --git a/src/test/ui/match/match-range-fail-dominate.stderr b/src/test/ui/match/match-range-fail-dominate.stderr
index f481e56c85e..d0ff4930a45 100644
--- a/src/test/ui/match/match-range-fail-dominate.stderr
+++ b/src/test/ui/match/match-range-fail-dominate.stderr
@@ -34,7 +34,7 @@ warning: floating-point types cannot be used in patterns
 LL |       0.01f64 ..= 6.5f64 => {}
    |       ^^^^^^^
    |
-   = note: #[warn(illegal_floating_point_literal_pattern)] on by default
+   = note: `#[warn(illegal_floating_point_literal_pattern)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #41620 <https://github.com/rust-lang/rust/issues/41620>
 
diff --git a/src/test/ui/never-assign-dead-code.stderr b/src/test/ui/never-assign-dead-code.stderr
index 6735310da8b..779780a90a8 100644
--- a/src/test/ui/never-assign-dead-code.stderr
+++ b/src/test/ui/never-assign-dead-code.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![warn(unused)]
    |         ^^^^^^
-   = note: #[warn(unreachable_code)] implied by #[warn(unused)]
+   = note: `#[warn(unreachable_code)]` implied by `#[warn(unused)]`
 
 warning: unreachable expression
   --> $DIR/never-assign-dead-code.rs:10:5
@@ -28,5 +28,5 @@ note: lint level defined here
    |
 LL | #![warn(unused)]
    |         ^^^^^^
-   = note: #[warn(unused_variables)] implied by #[warn(unused)]
+   = note: `#[warn(unused_variables)]` implied by `#[warn(unused)]`
 
diff --git a/src/test/ui/nll/issue-51191.stderr b/src/test/ui/nll/issue-51191.stderr
index e226de15dc2..7fa355eabb2 100644
--- a/src/test/ui/nll/issue-51191.stderr
+++ b/src/test/ui/nll/issue-51191.stderr
@@ -7,7 +7,7 @@ LL |
 LL |         (&mut self).bar();
    |         ----------------- recursive call site
    |
-   = note: #[warn(unconditional_recursion)] on by default
+   = note: `#[warn(unconditional_recursion)]` on by default
    = help: a `loop` may express intention better if this is on purpose
 
 error[E0596]: cannot borrow `self` as mutable, as it is not declared as mutable
diff --git a/src/test/ui/parser/trait-object-trait-parens.stderr b/src/test/ui/parser/trait-object-trait-parens.stderr
index e3fb8a0113a..03fb764ee03 100644
--- a/src/test/ui/parser/trait-object-trait-parens.stderr
+++ b/src/test/ui/parser/trait-object-trait-parens.stderr
@@ -16,7 +16,7 @@ warning: trait objects without an explicit `dyn` are deprecated
 LL |     let _: Box<(Copy) + (?Sized) + (for<'a> Trait<'a>)>;
    |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `dyn`: `dyn (Copy) + (?Sized) + (for<'a> Trait<'a>)`
    |
-   = note: #[warn(bare_trait_objects)] on by default
+   = note: `#[warn(bare_trait_objects)]` on by default
 
 warning: trait objects without an explicit `dyn` are deprecated
   --> $DIR/trait-object-trait-parens.rs:9:16
diff --git a/src/test/ui/path-lookahead.stderr b/src/test/ui/path-lookahead.stderr
index 50593e45230..197848e428a 100644
--- a/src/test/ui/path-lookahead.stderr
+++ b/src/test/ui/path-lookahead.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![warn(unused)]
    |         ^^^^^^
-   = note: #[warn(unused_parens)] implied by #[warn(unused)]
+   = note: `#[warn(unused_parens)]` implied by `#[warn(unused)]`
 
 warning: function is never used: `with_parens`
   --> $DIR/path-lookahead.rs:7:1
@@ -22,7 +22,7 @@ note: lint level defined here
    |
 LL | #![warn(unused)]
    |         ^^^^^^
-   = note: #[warn(dead_code)] implied by #[warn(unused)]
+   = note: `#[warn(dead_code)]` implied by `#[warn(unused)]`
 
 warning: function is never used: `no_parens`
   --> $DIR/path-lookahead.rs:11:1
diff --git a/src/test/ui/privacy/legacy-ctor-visibility.stderr b/src/test/ui/privacy/legacy-ctor-visibility.stderr
index f0590951c08..69b6e08befc 100644
--- a/src/test/ui/privacy/legacy-ctor-visibility.stderr
+++ b/src/test/ui/privacy/legacy-ctor-visibility.stderr
@@ -4,7 +4,7 @@ error: private struct constructors are not usable through re-exports in outer mo
 LL |             S(10);
    |             ^
    |
-   = note: #[deny(legacy_constructor_visibility)] on by default
+   = note: `#[deny(legacy_constructor_visibility)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #39207 <https://github.com/rust-lang/rust/issues/39207>
 
diff --git a/src/test/ui/privacy/private-in-public-assoc-ty.stderr b/src/test/ui/privacy/private-in-public-assoc-ty.stderr
index 81d70ee7708..0b32e4cd306 100644
--- a/src/test/ui/privacy/private-in-public-assoc-ty.stderr
+++ b/src/test/ui/privacy/private-in-public-assoc-ty.stderr
@@ -10,7 +10,7 @@ LL | |         fn infer_exist() -> Self::Exist;
 LL | |     }
    | |_____^
    |
-   = note: #[warn(private_in_public)] on by default
+   = note: `#[warn(private_in_public)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
 
diff --git a/src/test/ui/privacy/private-in-public-non-principal.stderr b/src/test/ui/privacy/private-in-public-non-principal.stderr
index 578f4380b42..4f2a5ea45aa 100644
--- a/src/test/ui/privacy/private-in-public-non-principal.stderr
+++ b/src/test/ui/privacy/private-in-public-non-principal.stderr
@@ -4,7 +4,7 @@ warning: private trait `PrivNonPrincipal` in public interface (error E0445)
 LL | pub fn leak_dyn_nonprincipal() -> Box<dyn PubPrincipal + PrivNonPrincipal> { loop {} }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: #[warn(private_in_public)] on by default
+   = note: `#[warn(private_in_public)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
 
diff --git a/src/test/ui/privacy/private-in-public-warn.stderr b/src/test/ui/privacy/private-in-public-warn.stderr
index 16b7e510328..9741f3b6d0d 100644
--- a/src/test/ui/privacy/private-in-public-warn.stderr
+++ b/src/test/ui/privacy/private-in-public-warn.stderr
@@ -339,7 +339,7 @@ warning: bounds on generic parameters are not enforced in type aliases
 LL |     pub type Alias<T: PrivTr> = T;
    |                       ^^^^^^
    |
-   = note: #[warn(type_alias_bounds)] on by default
+   = note: `#[warn(type_alias_bounds)]` on by default
    = help: the bound will not be checked when the type alias is used, and should be removed
 
 warning: where clauses are not enforced in type aliases
diff --git a/src/test/ui/proc-macro/attributes-included.stderr b/src/test/ui/proc-macro/attributes-included.stderr
index fcd77b2d383..0f74f45e102 100644
--- a/src/test/ui/proc-macro/attributes-included.stderr
+++ b/src/test/ui/proc-macro/attributes-included.stderr
@@ -9,5 +9,5 @@ note: lint level defined here
    |
 LL | #![warn(unused)]
    |         ^^^^^^
-   = note: #[warn(unused_variables)] implied by #[warn(unused)]
+   = note: `#[warn(unused_variables)]` implied by `#[warn(unused)]`
 
diff --git a/src/test/ui/proc-macro/generate-mod.stderr b/src/test/ui/proc-macro/generate-mod.stderr
index 1b828b4f03f..51bbb23da75 100644
--- a/src/test/ui/proc-macro/generate-mod.stderr
+++ b/src/test/ui/proc-macro/generate-mod.stderr
@@ -28,7 +28,7 @@ warning: cannot find type `FromOutside` in this scope
 LL | #[derive(generate_mod::CheckDerive)]
    |          ^^^^^^^^^^^^^^^^^^^^^^^^^ names from parent modules are not accessible without an explicit import
    |
-   = note: #[warn(proc_macro_derive_resolution_fallback)] on by default
+   = note: `#[warn(proc_macro_derive_resolution_fallback)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #50504 <https://github.com/rust-lang/rust/issues/50504>
 
diff --git a/src/test/ui/pub/pub-reexport-priv-extern-crate.stderr b/src/test/ui/pub/pub-reexport-priv-extern-crate.stderr
index 61c148bf2df..0b44c5a6525 100644
--- a/src/test/ui/pub/pub-reexport-priv-extern-crate.stderr
+++ b/src/test/ui/pub/pub-reexport-priv-extern-crate.stderr
@@ -4,7 +4,7 @@ error: extern crate `core` is private, and cannot be re-exported (error E0365),
 LL | pub use core as reexported_core;
    |         ^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: #[deny(pub_use_of_private_extern_crate)] on by default
+   = note: `#[deny(pub_use_of_private_extern_crate)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #34537 <https://github.com/rust-lang/rust/issues/34537>
 
diff --git a/src/test/ui/regions/region-bound-on-closure-outlives-call.stderr b/src/test/ui/regions/region-bound-on-closure-outlives-call.stderr
index d455902ee8c..c720b26aa03 100644
--- a/src/test/ui/regions/region-bound-on-closure-outlives-call.stderr
+++ b/src/test/ui/regions/region-bound-on-closure-outlives-call.stderr
@@ -7,7 +7,7 @@ LL |
 LL |     (|x| f(x))(call_rec(f))
    |                ----------- recursive call site
    |
-   = note: #[warn(unconditional_recursion)] on by default
+   = note: `#[warn(unconditional_recursion)]` on by default
    = help: a `loop` may express intention better if this is on purpose
 
 error[E0505]: cannot move out of `f` because it is borrowed
diff --git a/src/test/ui/removing-extern-crate.stderr b/src/test/ui/removing-extern-crate.stderr
index fbdcb158257..18d0756e9f4 100644
--- a/src/test/ui/removing-extern-crate.stderr
+++ b/src/test/ui/removing-extern-crate.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![warn(rust_2018_idioms)]
    |         ^^^^^^^^^^^^^^^^
-   = note: #[warn(unused_extern_crates)] implied by #[warn(rust_2018_idioms)]
+   = note: `#[warn(unused_extern_crates)]` implied by `#[warn(rust_2018_idioms)]`
 
 warning: unused extern crate
   --> $DIR/removing-extern-crate.rs:10:1
diff --git a/src/test/ui/rfc1445/match-forbidden-without-eq.stderr b/src/test/ui/rfc1445/match-forbidden-without-eq.stderr
index 4ec1e8ddb95..c05bb8f19f3 100644
--- a/src/test/ui/rfc1445/match-forbidden-without-eq.stderr
+++ b/src/test/ui/rfc1445/match-forbidden-without-eq.stderr
@@ -10,7 +10,7 @@ warning: floating-point types cannot be used in patterns
 LL |         f32::INFINITY => { }
    |         ^^^^^^^^^^^^^
    |
-   = note: #[warn(illegal_floating_point_literal_pattern)] on by default
+   = note: `#[warn(illegal_floating_point_literal_pattern)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #41620 <https://github.com/rust-lang/rust/issues/41620>
 
diff --git a/src/test/ui/rust-2018/async-ident-allowed.stderr b/src/test/ui/rust-2018/async-ident-allowed.stderr
index d3e450e9be0..2394bff1181 100644
--- a/src/test/ui/rust-2018/async-ident-allowed.stderr
+++ b/src/test/ui/rust-2018/async-ident-allowed.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![deny(rust_2018_compatibility)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^
-   = note: #[deny(keyword_idents)] implied by #[deny(rust_2018_compatibility)]
+   = note: `#[deny(keyword_idents)]` implied by `#[deny(rust_2018_compatibility)]`
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
    = note: for more information, see issue #49716 <https://github.com/rust-lang/rust/issues/49716>
 
diff --git a/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.stderr b/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.stderr
index 13980c70a82..12a6110bfb4 100644
--- a/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.stderr
+++ b/src/test/ui/rust-2018/extern-crate-idiomatic-in-2018.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![deny(rust_2018_idioms)]
    |         ^^^^^^^^^^^^^^^^
-   = note: #[deny(unused_extern_crates)] implied by #[deny(rust_2018_idioms)]
+   = note: `#[deny(unused_extern_crates)]` implied by `#[deny(rust_2018_idioms)]`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rust-2018/issue-54400-unused-extern-crate-attr-span.stderr b/src/test/ui/rust-2018/issue-54400-unused-extern-crate-attr-span.stderr
index 49aaff620d6..957a04cd980 100644
--- a/src/test/ui/rust-2018/issue-54400-unused-extern-crate-attr-span.stderr
+++ b/src/test/ui/rust-2018/issue-54400-unused-extern-crate-attr-span.stderr
@@ -12,7 +12,7 @@ note: lint level defined here
    |
 LL | #![deny(rust_2018_idioms)]
    |         ^^^^^^^^^^^^^^^^
-   = note: #[deny(unused_extern_crates)] implied by #[deny(rust_2018_idioms)]
+   = note: `#[deny(unused_extern_crates)]` implied by `#[deny(rust_2018_idioms)]`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/rust-2018/macro-use-warned-against.stderr b/src/test/ui/rust-2018/macro-use-warned-against.stderr
index c3e459606e1..944b56e9577 100644
--- a/src/test/ui/rust-2018/macro-use-warned-against.stderr
+++ b/src/test/ui/rust-2018/macro-use-warned-against.stderr
@@ -21,5 +21,5 @@ note: lint level defined here
    |
 LL | #![warn(macro_use_extern_crate, unused)]
    |                                 ^^^^^^
-   = note: #[warn(unused_imports)] implied by #[warn(unused)]
+   = note: `#[warn(unused_imports)]` implied by `#[warn(unused)]`
 
diff --git a/src/test/ui/rust-2018/remove-extern-crate.stderr b/src/test/ui/rust-2018/remove-extern-crate.stderr
index 5de0dfe9613..4777565452a 100644
--- a/src/test/ui/rust-2018/remove-extern-crate.stderr
+++ b/src/test/ui/rust-2018/remove-extern-crate.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![warn(rust_2018_idioms)]
    |         ^^^^^^^^^^^^^^^^
-   = note: #[warn(unused_extern_crates)] implied by #[warn(rust_2018_idioms)]
+   = note: `#[warn(unused_extern_crates)]` implied by `#[warn(rust_2018_idioms)]`
 
 warning: `extern crate` is not idiomatic in the new edition
   --> $DIR/remove-extern-crate.rs:32:5
diff --git a/src/test/ui/rust-2018/suggestions-not-always-applicable.stderr b/src/test/ui/rust-2018/suggestions-not-always-applicable.stderr
index 19e87b664cc..5add50e87f7 100644
--- a/src/test/ui/rust-2018/suggestions-not-always-applicable.stderr
+++ b/src/test/ui/rust-2018/suggestions-not-always-applicable.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![warn(rust_2018_compatibility)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^
-   = note: #[warn(absolute_paths_not_starting_with_crate)] implied by #[warn(rust_2018_compatibility)]
+   = note: `#[warn(absolute_paths_not_starting_with_crate)]` implied by `#[warn(rust_2018_compatibility)]`
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
    = note: for more information, see issue #53130 <https://github.com/rust-lang/rust/issues/53130>
 
diff --git a/src/test/ui/rust-2018/try-ident.stderr b/src/test/ui/rust-2018/try-ident.stderr
index 94946035899..852e3e5aed6 100644
--- a/src/test/ui/rust-2018/try-ident.stderr
+++ b/src/test/ui/rust-2018/try-ident.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![warn(rust_2018_compatibility)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^
-   = note: #[warn(keyword_idents)] implied by #[warn(rust_2018_compatibility)]
+   = note: `#[warn(keyword_idents)]` implied by `#[warn(rust_2018_compatibility)]`
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
    = note: for more information, see issue #49716 <https://github.com/rust-lang/rust/issues/49716>
 
diff --git a/src/test/ui/rust-2018/try-macro.stderr b/src/test/ui/rust-2018/try-macro.stderr
index 40a4564cc3d..eb65d415064 100644
--- a/src/test/ui/rust-2018/try-macro.stderr
+++ b/src/test/ui/rust-2018/try-macro.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![warn(rust_2018_compatibility)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^
-   = note: #[warn(keyword_idents)] implied by #[warn(rust_2018_compatibility)]
+   = note: `#[warn(keyword_idents)]` implied by `#[warn(rust_2018_compatibility)]`
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in the 2018 edition!
    = note: for more information, see issue #49716 <https://github.com/rust-lang/rust/issues/49716>
 
diff --git a/src/test/ui/safe-extern-statics.stderr b/src/test/ui/safe-extern-statics.stderr
index 86976a2c932..0948fad74e5 100644
--- a/src/test/ui/safe-extern-statics.stderr
+++ b/src/test/ui/safe-extern-statics.stderr
@@ -4,7 +4,7 @@ error: use of extern static is unsafe and requires unsafe function or block (err
 LL |     let a = A;
    |             ^
    |
-   = note: #[deny(safe_extern_statics)] on by default
+   = note: `#[deny(safe_extern_statics)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #36247 <https://github.com/rust-lang/rust/issues/36247>
    = note: extern statics are not controlled by the Rust type system: invalid data, aliasing violations or data races will cause undefined behavior
diff --git a/src/test/ui/span/issue-24690.stderr b/src/test/ui/span/issue-24690.stderr
index 0864497911d..b2160e66a74 100644
--- a/src/test/ui/span/issue-24690.stderr
+++ b/src/test/ui/span/issue-24690.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![warn(unused)]
    |         ^^^^^^
-   = note: #[warn(unused_variables)] implied by #[warn(unused)]
+   = note: `#[warn(unused_variables)]` implied by `#[warn(unused)]`
 
 warning: variable `theTwo` should have a snake case name
   --> $DIR/issue-24690.rs:12:9
@@ -17,7 +17,7 @@ warning: variable `theTwo` should have a snake case name
 LL |     let theTwo = 2;
    |         ^^^^^^ help: convert the identifier to snake case: `the_two`
    |
-   = note: #[warn(non_snake_case)] on by default
+   = note: `#[warn(non_snake_case)]` on by default
 
 warning: variable `theOtherTwo` should have a snake case name
   --> $DIR/issue-24690.rs:13:9
diff --git a/src/test/ui/span/macro-span-replacement.stderr b/src/test/ui/span/macro-span-replacement.stderr
index 128e4ec1212..8b65e798b6e 100644
--- a/src/test/ui/span/macro-span-replacement.stderr
+++ b/src/test/ui/span/macro-span-replacement.stderr
@@ -12,5 +12,5 @@ note: lint level defined here
    |
 LL | #![warn(unused)]
    |         ^^^^^^
-   = note: #[warn(dead_code)] implied by #[warn(unused)]
+   = note: `#[warn(dead_code)]` implied by `#[warn(unused)]`
 
diff --git a/src/test/ui/span/multispan-import-lint.stderr b/src/test/ui/span/multispan-import-lint.stderr
index a730d081b7c..a54c86cdb0f 100644
--- a/src/test/ui/span/multispan-import-lint.stderr
+++ b/src/test/ui/span/multispan-import-lint.stderr
@@ -9,5 +9,5 @@ note: lint level defined here
    |
 LL | #![warn(unused)]
    |         ^^^^^^
-   = note: #[warn(unused_imports)] implied by #[warn(unused)]
+   = note: `#[warn(unused_imports)]` implied by `#[warn(unused)]`
 
diff --git a/src/test/ui/span/unused-warning-point-at-signature.stderr b/src/test/ui/span/unused-warning-point-at-signature.stderr
index 3007d90c990..83e2ec1987b 100644
--- a/src/test/ui/span/unused-warning-point-at-signature.stderr
+++ b/src/test/ui/span/unused-warning-point-at-signature.stderr
@@ -9,7 +9,7 @@ note: lint level defined here
    |
 LL | #![warn(unused)]
    |         ^^^^^^
-   = note: #[warn(dead_code)] implied by #[warn(unused)]
+   = note: `#[warn(dead_code)]` implied by `#[warn(unused)]`
 
 warning: struct is never constructed: `Struct`
   --> $DIR/unused-warning-point-at-signature.rs:12:1
diff --git a/src/test/ui/traits/trait-bounds-not-on-bare-trait.stderr b/src/test/ui/traits/trait-bounds-not-on-bare-trait.stderr
index 250ea4b1c32..f64e637425d 100644
--- a/src/test/ui/traits/trait-bounds-not-on-bare-trait.stderr
+++ b/src/test/ui/traits/trait-bounds-not-on-bare-trait.stderr
@@ -4,7 +4,7 @@ warning: trait objects without an explicit `dyn` are deprecated
 LL | fn foo(_x: Foo + Send) {
    |            ^^^^^^^^^^ help: use `dyn`: `dyn Foo + Send`
    |
-   = note: #[warn(bare_trait_objects)] on by default
+   = note: `#[warn(bare_trait_objects)]` on by default
 
 error[E0277]: the size for values of type `(dyn Foo + std::marker::Send + 'static)` cannot be known at compilation time
   --> $DIR/trait-bounds-not-on-bare-trait.rs:7:8
diff --git a/src/test/ui/transmute/transmute-imut-to-mut.stderr b/src/test/ui/transmute/transmute-imut-to-mut.stderr
index d2445f0c7f3..d323c1a73b7 100644
--- a/src/test/ui/transmute/transmute-imut-to-mut.stderr
+++ b/src/test/ui/transmute/transmute-imut-to-mut.stderr
@@ -4,7 +4,7 @@ error: mutating transmuted &mut T from &T may cause undefined behavior, consider
 LL |     let _a: &mut u8 = unsafe { transmute(&1u8) };
    |                                ^^^^^^^^^
    |
-   = note: #[deny(mutable_transmutes)] on by default
+   = note: `#[deny(mutable_transmutes)]` on by default
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy.stderr b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy.stderr
index 12d61fc42a3..af0bad80690 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy.stderr
+++ b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-copy.stderr
@@ -4,7 +4,7 @@ warning: Trait bound std::string::String: std::marker::Copy does not depend on a
 LL | fn copy_string(t: String) -> String where String: Copy {
    |                                                   ^^^^
    |
-   = note: #[warn(trivial_bounds)] on by default
+   = note: `#[warn(trivial_bounds)]` on by default
 
 warning: Trait bound std::string::String: std::marker::Copy does not depend on any type or lifetime parameters
   --> $DIR/trivial-bounds-inconsistent-copy.rs:13:56
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection.stderr b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection.stderr
index 561614dc528..f2aa482f6de 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection.stderr
+++ b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-projection.stderr
@@ -4,7 +4,7 @@ warning: Trait bound B: A does not depend on any type or lifetime parameters
 LL |     B: A
    |        ^
    |
-   = note: #[warn(trivial_bounds)] on by default
+   = note: `#[warn(trivial_bounds)]` on by default
 
 warning: Trait bound B: A does not depend on any type or lifetime parameters
   --> $DIR/trivial-bounds-inconsistent-projection.rs:28:8
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-sized.stderr b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-sized.stderr
index fda1d6d70ac..a80ebc173f0 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-sized.stderr
+++ b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-sized.stderr
@@ -4,7 +4,7 @@ warning: Trait bound str: std::marker::Sized does not depend on any type or life
 LL | struct S(str, str) where str: Sized;
    |                               ^^^^^
    |
-   = note: #[warn(trivial_bounds)] on by default
+   = note: `#[warn(trivial_bounds)]` on by default
 
 warning: Trait bound for<'a> T<(dyn A + 'a)>: std::marker::Sized does not depend on any type or lifetime parameters
   --> $DIR/trivial-bounds-inconsistent-sized.rs:16:49
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.stderr b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.stderr
index a72e3f75cf6..fdc3ff1d3b5 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.stderr
+++ b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent-well-formed.stderr
@@ -4,7 +4,7 @@ warning: Trait bound std::vec::Vec<str>: std::fmt::Debug does not depend on any
 LL | pub fn foo() where Vec<str>: Debug, str: Copy {
    |                              ^^^^^
    |
-   = note: #[warn(trivial_bounds)] on by default
+   = note: `#[warn(trivial_bounds)]` on by default
 
 warning: Trait bound str: std::marker::Copy does not depend on any type or lifetime parameters
   --> $DIR/trivial-bounds-inconsistent-well-formed.rs:7:42
diff --git a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent.stderr b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent.stderr
index a0d638f1714..0eb0769c570 100644
--- a/src/test/ui/trivial-bounds/trivial-bounds-inconsistent.stderr
+++ b/src/test/ui/trivial-bounds/trivial-bounds-inconsistent.stderr
@@ -4,7 +4,7 @@ warning: Trait bound i32: Foo does not depend on any type or lifetime parameters
 LL | enum E where i32: Foo { V }
    |                   ^^^
    |
-   = note: #[warn(trivial_bounds)] on by default
+   = note: `#[warn(trivial_bounds)]` on by default
 
 warning: Trait bound i32: Foo does not depend on any type or lifetime parameters
   --> $DIR/trivial-bounds-inconsistent.rs:16:21
@@ -30,7 +30,7 @@ warning: where clauses are not enforced in type aliases
 LL | type Y where i32: Foo = ();
    |              ^^^^^^^^
    |
-   = note: #[warn(type_alias_bounds)] on by default
+   = note: `#[warn(type_alias_bounds)]` on by default
    = help: the clause will not be checked when the type alias is used, and should be removed
 
 warning: Trait bound i32: Foo does not depend on any type or lifetime parameters
diff --git a/src/test/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.stderr b/src/test/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.stderr
index ef025e0e146..db8767273b4 100644
--- a/src/test/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.stderr
+++ b/src/test/ui/type-alias-enum-variants/enum-variant-priority-lint-ambiguous_associated_items.stderr
@@ -4,7 +4,7 @@ error: ambiguous associated item
 LL |     fn f() -> Self::V { 0 }
    |               ^^^^^^^ help: use fully-qualified syntax: `<E as Tr>::V`
    |
-   = note: #[deny(ambiguous_associated_items)] on by default
+   = note: `#[deny(ambiguous_associated_items)]` on by default
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #57644 <https://github.com/rust-lang/rust/issues/57644>
 note: `V` could refer to variant defined here
diff --git a/src/test/ui/type/type-alias-bounds.stderr b/src/test/ui/type/type-alias-bounds.stderr
index 177e5f893ed..dbb7b92563a 100644
--- a/src/test/ui/type/type-alias-bounds.stderr
+++ b/src/test/ui/type/type-alias-bounds.stderr
@@ -4,7 +4,7 @@ warning: bounds on generic parameters are not enforced in type aliases
 LL | type SVec<T: Send + Send> = Vec<T>;
    |              ^^^^   ^^^^
    |
-   = note: #[warn(type_alias_bounds)] on by default
+   = note: `#[warn(type_alias_bounds)]` on by default
    = help: the bound will not be checked when the type alias is used, and should be removed
 
 warning: where clauses are not enforced in type aliases
diff --git a/src/test/ui/utf8_idents.stderr b/src/test/ui/utf8_idents.stderr
index df9910f191c..56de63da4f9 100644
--- a/src/test/ui/utf8_idents.stderr
+++ b/src/test/ui/utf8_idents.stderr
@@ -40,7 +40,7 @@ warning: type parameter `γ` should have an upper camel case name
 LL |     γ
    |     ^ help: convert the identifier to upper camel case: `Γ`
    |
-   = note: #[warn(non_camel_case_types)] on by default
+   = note: `#[warn(non_camel_case_types)]` on by default
 
 error: aborting due to 4 previous errors
 
diff --git a/src/test/ui/while-let.stderr b/src/test/ui/while-let.stderr
index 156d0e6c33d..348925aa970 100644
--- a/src/test/ui/while-let.stderr
+++ b/src/test/ui/while-let.stderr
@@ -9,7 +9,7 @@ LL | |         println!("irrefutable pattern");
 LL | |     });
    | |_______- in this macro invocation
    |
-   = note: #[warn(irrefutable_let_patterns)] on by default
+   = note: `#[warn(irrefutable_let_patterns)]` on by default
 
 warning: irrefutable while-let pattern
   --> $DIR/while-let.rs:6:13