Attributes cleanup in tests [13/20]

Author: samueltardieu

tests/ui/needless_borrow.fixed

@@ -1,13 +1,9 @@
-#![allow(
-    unused,
-    non_local_definitions,
-    clippy::uninlined_format_args,
-    clippy::unnecessary_mut_passed,
-    clippy::unnecessary_to_owned,
+#![warn(clippy::needless_borrow)]
+#![expect(
+    clippy::needless_lifetimes,
     clippy::unnecessary_literal_unwrap,
-    clippy::needless_lifetimes
+    clippy::unnecessary_mut_passed
 )]
-#![warn(clippy::needless_borrow)]
 
 fn main() {
     let a = 5;

tests/ui/needless_borrow.rs

@@ -1,13 +1,9 @@
-#![allow(
-    unused,
-    non_local_definitions,
-    clippy::uninlined_format_args,
-    clippy::unnecessary_mut_passed,
-    clippy::unnecessary_to_owned,
+#![warn(clippy::needless_borrow)]
+#![expect(
+    clippy::needless_lifetimes,
     clippy::unnecessary_literal_unwrap,
-    clippy::needless_lifetimes
+    clippy::unnecessary_mut_passed
 )]
-#![warn(clippy::needless_borrow)]
 
 fn main() {
     let a = 5;

tests/ui/needless_borrow.stderr

@@ -1,5 +1,5 @@
 error: this expression creates a reference which is immediately dereferenced by the compiler
-  --> tests/ui/needless_borrow.rs:16:15
+  --> tests/ui/needless_borrow.rs:12:15
    |
 LL |     let _ = x(&&a); // warn
    |               ^^^ help: change this to: `&a`
@@ -8,163 +8,163 @@ LL |     let _ = x(&&a); // warn
    = help: to override `-D warnings` add `#[allow(clippy::needless_borrow)]`
 
 error: this expression creates a reference which is immediately dereferenced by the compiler
-  --> tests/ui/needless_borrow.rs:22:13
+  --> tests/ui/needless_borrow.rs:18:13
    |
 LL |     mut_ref(&mut &mut b); // warn
    |             ^^^^^^^^^^^ help: change this to: `&mut b`
 
 error: this expression creates a reference which is immediately dereferenced by the compiler
-  --> tests/ui/needless_borrow.rs:36:13
+  --> tests/ui/needless_borrow.rs:32:13
    |
 LL |             &&a
    |             ^^^ help: change this to: `&a`
 
 error: this expression creates a reference which is immediately dereferenced by the compiler
-  --> tests/ui/needless_borrow.rs:39:15
+  --> tests/ui/needless_borrow.rs:35:15
    |
 LL |         46 => &&a,
    |               ^^^ help: change this to: `&a`
 
 error: this expression creates a reference which is immediately dereferenced by the compiler
-  --> tests/ui/needless_borrow.rs:46:27
+  --> tests/ui/needless_borrow.rs:42:27
    |
 LL |                     break &ref_a;
    |                           ^^^^^^ help: change this to: `ref_a`
 
 error: this expression creates a reference which is immediately dereferenced by the compiler
-  --> tests/ui/needless_borrow.rs:54:15
+  --> tests/ui/needless_borrow.rs:50:15
    |
 LL |     let _ = x(&&&a);
    |               ^^^^ help: change this to: `&a`
 
 error: this expression creates a reference which is immediately dereferenced by the compiler
-  --> tests/ui/needless_borrow.rs:56:15
+  --> tests/ui/needless_borrow.rs:52:15
    |
 LL |     let _ = x(&mut &&a);
    |               ^^^^^^^^ help: change this to: `&a`
 
 error: this expression creates a reference which is immediately dereferenced by the compiler
-  --> tests/ui/needless_borrow.rs:58:15
+  --> tests/ui/needless_borrow.rs:54:15
    |
 LL |     let _ = x(&&&mut b);
    |               ^^^^^^^^ help: change this to: `&mut b`
 
 error: this expression creates a reference which is immediately dereferenced by the compiler
-  --> tests/ui/needless_borrow.rs:60:15
+  --> tests/ui/needless_borrow.rs:56:15
    |
 LL |     let _ = x(&&ref_a);
    |               ^^^^^^^ help: change this to: `ref_a`
 
 error: this expression creates a reference which is immediately dereferenced by the compiler
-  --> tests/ui/needless_borrow.rs:64:11
+  --> tests/ui/needless_borrow.rs:60:11
    |
 LL |         x(&b);
    |           ^^ help: change this to: `b`
 
 error: this expression creates a reference which is immediately dereferenced by the compiler
-  --> tests/ui/needless_borrow.rs:72:13
+  --> tests/ui/needless_borrow.rs:68:13
    |
 LL |     mut_ref(&mut x);
    |             ^^^^^^ help: change this to: `x`
 
 error: this expression creates a reference which is immediately dereferenced by the compiler
-  --> tests/ui/needless_borrow.rs:74:13
+  --> tests/ui/needless_borrow.rs:70:13
    |
 LL |     mut_ref(&mut &mut x);
    |             ^^^^^^^^^^^ help: change this to: `x`
 
 error: this expression creates a reference which is immediately dereferenced by the compiler
-  --> tests/ui/needless_borrow.rs:76:23
+  --> tests/ui/needless_borrow.rs:72:23
    |
 LL |     let y: &mut i32 = &mut x;
    |                       ^^^^^^ help: change this to: `x`
 
 error: this expression creates a reference which is immediately dereferenced by the compiler
-  --> tests/ui/needless_borrow.rs:78:23
+  --> tests/ui/needless_borrow.rs:74:23
    |
 LL |     let y: &mut i32 = &mut &mut x;
    |                       ^^^^^^^^^^^ help: change this to: `x`
 
 error: this expression creates a reference which is immediately dereferenced by the compiler
-  --> tests/ui/needless_borrow.rs:88:14
+  --> tests/ui/needless_borrow.rs:84:14
    |
 LL |         0 => &mut x,
    |              ^^^^^^ help: change this to: `x`
 
 error: this expression creates a reference which is immediately dereferenced by the compiler
-  --> tests/ui/needless_borrow.rs:95:14
+  --> tests/ui/needless_borrow.rs:91:14
    |
 LL |         0 => &mut x,
    |              ^^^^^^ help: change this to: `x`
 
 error: this expression borrows a value the compiler would automatically borrow
-  --> tests/ui/needless_borrow.rs:108:13
+  --> tests/ui/needless_borrow.rs:104:13
    |
 LL |     let _ = (&x).0;
    |             ^^^^ help: change this to: `x`
 
 error: this expression creates a reference which is immediately dereferenced by the compiler
-  --> tests/ui/needless_borrow.rs:119:5
+  --> tests/ui/needless_borrow.rs:115:5
    |
 LL |     (&&()).foo();
    |     ^^^^^^ help: change this to: `(&())`
 
 error: this expression creates a reference which is immediately dereferenced by the compiler
-  --> tests/ui/needless_borrow.rs:129:5
+  --> tests/ui/needless_borrow.rs:125:5
    |
 LL |     (&&5).foo();
    |     ^^^^^ help: change this to: `(&5)`
 
 error: this expression creates a reference which is immediately dereferenced by the compiler
-  --> tests/ui/needless_borrow.rs:156:23
+  --> tests/ui/needless_borrow.rs:152:23
    |
 LL |     let x: (&str,) = (&"",);
    |                       ^^^ help: change this to: `""`
 
 error: this expression borrows a value the compiler would automatically borrow
-  --> tests/ui/needless_borrow.rs:199:13
+  --> tests/ui/needless_borrow.rs:195:13
    |
 LL |             (&self.f)()
    |             ^^^^^^^^^ help: change this to: `(self.f)`
 
 error: this expression borrows a value the compiler would automatically borrow
-  --> tests/ui/needless_borrow.rs:209:13
+  --> tests/ui/needless_borrow.rs:205:13
    |
 LL |             (&mut self.f)()
    |             ^^^^^^^^^^^^^ help: change this to: `(self.f)`
 
 error: this expression borrows a value the compiler would automatically borrow
-  --> tests/ui/needless_borrow.rs:247:22
+  --> tests/ui/needless_borrow.rs:243:22
    |
 LL |         let _ = &mut (&mut { x.u }).x;
    |                      ^^^^^^^^^^^^^^ help: change this to: `{ x.u }`
 
 error: this expression borrows a value the compiler would automatically borrow
-  --> tests/ui/needless_borrow.rs:255:22
+  --> tests/ui/needless_borrow.rs:251:22
    |
 LL |         let _ = &mut (&mut { x.u }).x;
    |                      ^^^^^^^^^^^^^^ help: change this to: `{ x.u }`
 
 error: this expression borrows a value the compiler would automatically borrow
-  --> tests/ui/needless_borrow.rs:260:22
+  --> tests/ui/needless_borrow.rs:256:22
    |
 LL |         let _ = &mut (&mut x.u).x;
    |                      ^^^^^^^^^^ help: change this to: `x.u`
 
 error: this expression borrows a value the compiler would automatically borrow
-  --> tests/ui/needless_borrow.rs:262:22
+  --> tests/ui/needless_borrow.rs:258:22
    |
 LL |         let _ = &mut (&mut { x.u }).x;
    |                      ^^^^^^^^^^^^^^ help: change this to: `{ x.u }`
 
 error: this expression creates a reference which is immediately dereferenced by the compiler
-  --> tests/ui/needless_borrow.rs:284:23
+  --> tests/ui/needless_borrow.rs:280:23
    |
 LL |     option.unwrap_or((&x.0,));
    |                       ^^^^ help: change this to: `x.0`
 
 error: this expression creates a reference which is immediately dereferenced by the compiler
-  --> tests/ui/needless_borrow.rs:291:13
+  --> tests/ui/needless_borrow.rs:287:13
    |
 LL |     let _ = (&slice).len();
    |             ^^^^^^^^ help: change this to: `slice`

tests/ui/needless_borrow_pat.fixed

@@ -1,5 +1,6 @@
 #![warn(clippy::needless_borrow)]
-#![allow(clippy::needless_borrowed_reference, clippy::explicit_auto_deref)]
+#![allow(clippy::needless_borrowed_reference)]
+#![expect(clippy::explicit_auto_deref)]
 
 fn f1(_: &str) {}
 macro_rules! m1 {
@@ -30,7 +31,6 @@ macro_rules! if_chain {
     };
 }
 
-#[allow(dead_code)]
 fn main() {
     let x = String::new();
 
@@ -160,7 +160,6 @@ impl T1 for S {
 }
 
 // Ok - used to error due to rustc bug
-#[allow(dead_code)]
 #[derive(Debug)]
 enum Foo<'a> {
     Str(&'a str),

tests/ui/needless_borrow_pat.rs

@@ -1,5 +1,6 @@
 #![warn(clippy::needless_borrow)]
-#![allow(clippy::needless_borrowed_reference, clippy::explicit_auto_deref)]
+#![allow(clippy::needless_borrowed_reference)]
+#![expect(clippy::explicit_auto_deref)]
 
 fn f1(_: &str) {}
 macro_rules! m1 {
@@ -30,7 +31,6 @@ macro_rules! if_chain {
     };
 }
 
-#[allow(dead_code)]
 fn main() {
     let x = String::new();
 
@@ -160,7 +160,6 @@ impl T1 for S {
 }
 
 // Ok - used to error due to rustc bug
-#[allow(dead_code)]
 #[derive(Debug)]
 enum Foo<'a> {
     Str(&'a str),

tests/ui/needless_borrowed_ref.fixed

@@ -1,10 +1,8 @@
 #![warn(clippy::needless_borrowed_reference)]
-#![allow(
-    unused,
+#![expect(
     irrefutable_let_patterns,
     non_shorthand_field_patterns,
     clippy::needless_borrow,
-    clippy::needless_ifs,
     clippy::unneeded_wildcard_pattern
 )]
 

tests/ui/needless_borrowed_ref.rs

@@ -1,10 +1,8 @@
 #![warn(clippy::needless_borrowed_reference)]
-#![allow(
-    unused,
+#![expect(
     irrefutable_let_patterns,
     non_shorthand_field_patterns,
     clippy::needless_borrow,
-    clippy::needless_ifs,
     clippy::unneeded_wildcard_pattern
 )]