rust-lang · bors · Jul 18, 2019 · Jul 16, 2019
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -4,13 +4,13 @@ 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
    |
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -4,5 +4,5 @@ warning: denote infinite loops with `loop { ... }`
 LL |     let s = "ZͨA͑ͦ͒͋ͤ͑̚L̄͑͋Ĝͨͥ̿͒̽̈́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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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