diff --git a/clippy_lints/src/types/rc_buffer.rs b/clippy_lints/src/types/rc_buffer.rs
index 46d9febb187f..0f0a83f455ef 100644
--- a/clippy_lints/src/types/rc_buffer.rs
+++ b/clippy_lints/src/types/rc_buffer.rs
@@ -20,7 +20,7 @@ pub(super) fn check(cx: &LateContext<'_>, hir_ty: &hir::Ty<'_>, qpath: &QPath<'_
                 cx,
                 RC_BUFFER,
                 hir_ty.span,
-                "usage of `Rc<T>` when T is a buffer type",
+                "usage of `Rc<T>` when `T` is a buffer type",
                 |diag| {
                     diag.span_suggestion(hir_ty.span, "try", format!("Rc<{alternate}>"), app);
                 },
@@ -41,7 +41,7 @@ pub(super) fn check(cx: &LateContext<'_>, hir_ty: &hir::Ty<'_>, qpath: &QPath<'_
                 cx,
                 RC_BUFFER,
                 hir_ty.span,
-                "usage of `Rc<T>` when T is a buffer type",
+                "usage of `Rc<T>` when `T` is a buffer type",
                 |diag| {
                     let mut applicability = app;
                     diag.span_suggestion(
@@ -64,7 +64,7 @@ pub(super) fn check(cx: &LateContext<'_>, hir_ty: &hir::Ty<'_>, qpath: &QPath<'_
                 cx,
                 RC_BUFFER,
                 hir_ty.span,
-                "usage of `Arc<T>` when T is a buffer type",
+                "usage of `Arc<T>` when `T` is a buffer type",
                 |diag| {
                     diag.span_suggestion(hir_ty.span, "try", format!("Arc<{alternate}>"), app);
                 },
@@ -82,7 +82,7 @@ pub(super) fn check(cx: &LateContext<'_>, hir_ty: &hir::Ty<'_>, qpath: &QPath<'_
                 cx,
                 RC_BUFFER,
                 hir_ty.span,
-                "usage of `Arc<T>` when T is a buffer type",
+                "usage of `Arc<T>` when `T` is a buffer type",
                 |diag| {
                     let mut applicability = app;
                     diag.span_suggestion(
diff --git a/tests/ui/rc_buffer.fixed b/tests/ui/rc_buffer.fixed
index c71a4072b962..93811a0ad2fc 100644
--- a/tests/ui/rc_buffer.fixed
+++ b/tests/ui/rc_buffer.fixed
@@ -1,5 +1,4 @@
 #![warn(clippy::rc_buffer)]
-#![allow(dead_code, unused_imports)]
 
 use std::cell::RefCell;
 use std::ffi::OsString;
diff --git a/tests/ui/rc_buffer.rs b/tests/ui/rc_buffer.rs
index 686c2644da17..a644a29a03c9 100644
--- a/tests/ui/rc_buffer.rs
+++ b/tests/ui/rc_buffer.rs
@@ -1,5 +1,4 @@
 #![warn(clippy::rc_buffer)]
-#![allow(dead_code, unused_imports)]
 
 use std::cell::RefCell;
 use std::ffi::OsString;
diff --git a/tests/ui/rc_buffer.stderr b/tests/ui/rc_buffer.stderr
index 7500523ab4ac..e7000bf506b6 100644
--- a/tests/ui/rc_buffer.stderr
+++ b/tests/ui/rc_buffer.stderr
@@ -1,5 +1,5 @@
-error: usage of `Rc<T>` when T is a buffer type
-  --> tests/ui/rc_buffer.rs:11:11
+error: usage of `Rc<T>` when `T` is a buffer type
+  --> tests/ui/rc_buffer.rs:10:11
    |
 LL |     bad1: Rc<String>,
    |           ^^^^^^^^^^ help: try: `Rc<str>`
@@ -7,44 +7,44 @@ LL |     bad1: Rc<String>,
    = note: `-D clippy::rc-buffer` implied by `-D warnings`
    = help: to override `-D warnings` add `#[allow(clippy::rc_buffer)]`
 
-error: usage of `Rc<T>` when T is a buffer type
-  --> tests/ui/rc_buffer.rs:13:11
+error: usage of `Rc<T>` when `T` is a buffer type
+  --> tests/ui/rc_buffer.rs:12:11
    |
 LL |     bad2: Rc<PathBuf>,
    |           ^^^^^^^^^^^ help: try: `Rc<std::path::Path>`
 
-error: usage of `Rc<T>` when T is a buffer type
-  --> tests/ui/rc_buffer.rs:15:11
+error: usage of `Rc<T>` when `T` is a buffer type
+  --> tests/ui/rc_buffer.rs:14:11
    |
 LL |     bad3: Rc<Vec<u8>>,
    |           ^^^^^^^^^^^ help: try: `Rc<[u8]>`
 
-error: usage of `Rc<T>` when T is a buffer type
-  --> tests/ui/rc_buffer.rs:17:11
+error: usage of `Rc<T>` when `T` is a buffer type
+  --> tests/ui/rc_buffer.rs:16:11
    |
 LL |     bad4: Rc<OsString>,
    |           ^^^^^^^^^^^^ help: try: `Rc<std::ffi::OsStr>`
 
-error: usage of `Rc<T>` when T is a buffer type
-  --> tests/ui/rc_buffer.rs:24:17
+error: usage of `Rc<T>` when `T` is a buffer type
+  --> tests/ui/rc_buffer.rs:23:17
    |
 LL | fn func_bad1(_: Rc<String>) {}
    |                 ^^^^^^^^^^ help: try: `Rc<str>`
 
-error: usage of `Rc<T>` when T is a buffer type
-  --> tests/ui/rc_buffer.rs:26:17
+error: usage of `Rc<T>` when `T` is a buffer type
+  --> tests/ui/rc_buffer.rs:25:17
    |
 LL | fn func_bad2(_: Rc<PathBuf>) {}
    |                 ^^^^^^^^^^^ help: try: `Rc<std::path::Path>`
 
-error: usage of `Rc<T>` when T is a buffer type
-  --> tests/ui/rc_buffer.rs:28:17
+error: usage of `Rc<T>` when `T` is a buffer type
+  --> tests/ui/rc_buffer.rs:27:17
    |
 LL | fn func_bad3(_: Rc<Vec<u8>>) {}
    |                 ^^^^^^^^^^^ help: try: `Rc<[u8]>`
 
-error: usage of `Rc<T>` when T is a buffer type
-  --> tests/ui/rc_buffer.rs:30:17
+error: usage of `Rc<T>` when `T` is a buffer type
+  --> tests/ui/rc_buffer.rs:29:17
    |
 LL | fn func_bad4(_: Rc<OsString>) {}
    |                 ^^^^^^^^^^^^ help: try: `Rc<std::ffi::OsStr>`
diff --git a/tests/ui/rc_buffer_arc.fixed b/tests/ui/rc_buffer_arc.fixed
index 27059e3f2e1f..8e0adec48da7 100644
--- a/tests/ui/rc_buffer_arc.fixed
+++ b/tests/ui/rc_buffer_arc.fixed
@@ -1,5 +1,4 @@
 #![warn(clippy::rc_buffer)]
-#![allow(dead_code, unused_imports)]
 
 use std::ffi::OsString;
 use std::path::PathBuf;
diff --git a/tests/ui/rc_buffer_arc.rs b/tests/ui/rc_buffer_arc.rs
index 5261eae2f26a..1ec8abbdae99 100644
--- a/tests/ui/rc_buffer_arc.rs
+++ b/tests/ui/rc_buffer_arc.rs
@@ -1,5 +1,4 @@
 #![warn(clippy::rc_buffer)]
-#![allow(dead_code, unused_imports)]
 
 use std::ffi::OsString;
 use std::path::PathBuf;
diff --git a/tests/ui/rc_buffer_arc.stderr b/tests/ui/rc_buffer_arc.stderr
index 786715463232..6997a5a28349 100644
--- a/tests/ui/rc_buffer_arc.stderr
+++ b/tests/ui/rc_buffer_arc.stderr
@@ -1,5 +1,5 @@
-error: usage of `Arc<T>` when T is a buffer type
-  --> tests/ui/rc_buffer_arc.rs:10:11
+error: usage of `Arc<T>` when `T` is a buffer type
+  --> tests/ui/rc_buffer_arc.rs:9:11
    |
 LL |     bad1: Arc<String>,
    |           ^^^^^^^^^^^ help: try: `Arc<str>`
@@ -7,44 +7,44 @@ LL |     bad1: Arc<String>,
    = note: `-D clippy::rc-buffer` implied by `-D warnings`
    = help: to override `-D warnings` add `#[allow(clippy::rc_buffer)]`
 
-error: usage of `Arc<T>` when T is a buffer type
-  --> tests/ui/rc_buffer_arc.rs:12:11
+error: usage of `Arc<T>` when `T` is a buffer type
+  --> tests/ui/rc_buffer_arc.rs:11:11
    |
 LL |     bad2: Arc<PathBuf>,
    |           ^^^^^^^^^^^^ help: try: `Arc<std::path::Path>`
 
-error: usage of `Arc<T>` when T is a buffer type
-  --> tests/ui/rc_buffer_arc.rs:14:11
+error: usage of `Arc<T>` when `T` is a buffer type
+  --> tests/ui/rc_buffer_arc.rs:13:11
    |
 LL |     bad3: Arc<Vec<u8>>,
    |           ^^^^^^^^^^^^ help: try: `Arc<[u8]>`
 
-error: usage of `Arc<T>` when T is a buffer type
-  --> tests/ui/rc_buffer_arc.rs:16:11
+error: usage of `Arc<T>` when `T` is a buffer type
+  --> tests/ui/rc_buffer_arc.rs:15:11
    |
 LL |     bad4: Arc<OsString>,
    |           ^^^^^^^^^^^^^ help: try: `Arc<std::ffi::OsStr>`
 
-error: usage of `Arc<T>` when T is a buffer type
-  --> tests/ui/rc_buffer_arc.rs:23:17
+error: usage of `Arc<T>` when `T` is a buffer type
+  --> tests/ui/rc_buffer_arc.rs:22:17
    |
 LL | fn func_bad1(_: Arc<String>) {}
    |                 ^^^^^^^^^^^ help: try: `Arc<str>`
 
-error: usage of `Arc<T>` when T is a buffer type
-  --> tests/ui/rc_buffer_arc.rs:25:17
+error: usage of `Arc<T>` when `T` is a buffer type
+  --> tests/ui/rc_buffer_arc.rs:24:17
    |
 LL | fn func_bad2(_: Arc<PathBuf>) {}
    |                 ^^^^^^^^^^^^ help: try: `Arc<std::path::Path>`
 
-error: usage of `Arc<T>` when T is a buffer type
-  --> tests/ui/rc_buffer_arc.rs:27:17
+error: usage of `Arc<T>` when `T` is a buffer type
+  --> tests/ui/rc_buffer_arc.rs:26:17
    |
 LL | fn func_bad3(_: Arc<Vec<u8>>) {}
    |                 ^^^^^^^^^^^^ help: try: `Arc<[u8]>`
 
-error: usage of `Arc<T>` when T is a buffer type
-  --> tests/ui/rc_buffer_arc.rs:29:17
+error: usage of `Arc<T>` when `T` is a buffer type
+  --> tests/ui/rc_buffer_arc.rs:28:17
    |
 LL | fn func_bad4(_: Arc<OsString>) {}
    |                 ^^^^^^^^^^^^^ help: try: `Arc<std::ffi::OsStr>`