Apply suggestion from code review

Author: JohnTitor

clippy_lints/src/attrs.rs

@@ -187,7 +187,7 @@ declare_clippy_lint! {
     /// ```
     pub DEPRECATED_CFG_ATTR,
     complexity,
-    "usage of `cfg_attr(rustfmt)` instead of `tool_attributes`"
+    "usage of `cfg_attr(rustfmt)` instead of tool attributes"
 }
 
 declare_lint_pass!(Attributes => [
@@ -520,7 +520,7 @@ impl EarlyLintPass for DeprecatedCfgAttribute {
                     cx,
                     DEPRECATED_CFG_ATTR,
                     attr.span,
-                    "`cfg_attr` is deprecated for rustfmt and got replaced by `tool_attributes`",
+                    "`cfg_attr` is deprecated for rustfmt and got replaced by tool attributes",
                     "use",
                     "#[rustfmt::skip]".to_string(),
                     Applicability::MachineApplicable,

clippy_lints/src/missing_const_for_fn.rs

@@ -113,7 +113,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingConstForFn {
                 cx.tcx.sess.span_err(span, &err);
             }
         } else {
-            span_lint(cx, MISSING_CONST_FOR_FN, span, "this could be a `const_fn`");
+            span_lint(cx, MISSING_CONST_FOR_FN, span, "this could be a `const fn`");
         }
     }
 }

src/lintlist/mod.rs

@@ -318,7 +318,7 @@ pub const ALL_LINTS: [Lint; 345] = [
     Lint {
         name: "deprecated_cfg_attr",
         group: "complexity",
-        desc: "usage of `cfg_attr(rustfmt)` instead of `tool_attributes`",
+        desc: "usage of `cfg_attr(rustfmt)` instead of tool attributes",
         deprecation: None,
         module: "attrs",
     },

tests/ui/cfg_attr_rustfmt.stderr

@@ -1,12 +1,12 @@
-error: `cfg_attr` is deprecated for rustfmt and got replaced by `tool_attributes`
+error: `cfg_attr` is deprecated for rustfmt and got replaced by tool attributes
   --> $DIR/cfg_attr_rustfmt.rs:18:5
    |
 LL |     #[cfg_attr(rustfmt, rustfmt::skip)]
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use: `#[rustfmt::skip]`
    |
    = note: `-D clippy::deprecated-cfg-attr` implied by `-D warnings`
 
-error: `cfg_attr` is deprecated for rustfmt and got replaced by `tool_attributes`
+error: `cfg_attr` is deprecated for rustfmt and got replaced by tool attributes
   --> $DIR/cfg_attr_rustfmt.rs:22:1
    |
 LL | #[cfg_attr(rustfmt, rustfmt_skip)]

tests/ui/missing_const_for_fn/could_be_const.stderr

@@ -1,4 +1,4 @@
-error: this could be a `const_fn`
+error: this could be a `const fn`
   --> $DIR/could_be_const.rs:12:5
    |
 LL | /     pub fn new() -> Self {
@@ -8,15 +8,15 @@ LL | |     }
    |
    = note: `-D clippy::missing-const-for-fn` implied by `-D warnings`
 
-error: this could be a `const_fn`
+error: this could be a `const fn`
   --> $DIR/could_be_const.rs:18:1
    |
 LL | / fn one() -> i32 {
 LL | |     1
 LL | | }
    | |_^
 
-error: this could be a `const_fn`
+error: this could be a `const fn`
   --> $DIR/could_be_const.rs:23:1
    |
 LL | / fn two() -> i32 {
@@ -25,39 +25,39 @@ LL | |     abc
 LL | | }
    | |_^
 
-error: this could be a `const_fn`
+error: this could be a `const fn`
   --> $DIR/could_be_const.rs:30:1
    |
 LL | / fn string() -> String {
 LL | |     String::new()
 LL | | }
    | |_^
 
-error: this could be a `const_fn`
+error: this could be a `const fn`
   --> $DIR/could_be_const.rs:35:1
    |
 LL | / unsafe fn four() -> i32 {
 LL | |     4
 LL | | }
    | |_^
 
-error: this could be a `const_fn`
+error: this could be a `const fn`
   --> $DIR/could_be_const.rs:40:1
    |
 LL | / fn generic<T>(t: T) -> T {
 LL | |     t
 LL | | }
    | |_^
 
-error: this could be a `const_fn`
+error: this could be a `const fn`
   --> $DIR/could_be_const.rs:44:1
    |
 LL | / fn sub(x: u32) -> usize {
 LL | |     unsafe { transmute(&x) }
 LL | | }
    | |_^
 
-error: this could be a `const_fn`
+error: this could be a `const fn`
   --> $DIR/could_be_const.rs:63:9
    |
 LL | /         pub fn b(self, a: &A) -> B {