fix clippy tests

estebank · estebank · commit e4efdce42d16 · 2025-02-25T17:40:02.000Z
diff --git a/src/tools/clippy/tests/ui/match_same_arms.stderr b/src/tools/clippy/tests/ui/match_same_arms.stderr
@@ -9,15 +9,15 @@ note: `_` wildcard arm here
   --> tests/ui/match_same_arms.rs:14:9
    |
 LL |         _ => 0,
-   |         ^^^^^^
+   |         ^^^^^^^
    = note: `-D clippy::match-same-arms` implied by `-D warnings`
    = help: to override `-D warnings` add `#[allow(clippy::match_same_arms)]`
 
 error: this match arm has an identical body to another arm
   --> tests/ui/match_same_arms.rs:18:9
    |
 LL |         (1, .., 3) => 42,
-   |         ^^^^^^^^^^^^^^^^
+   |         ^^^^^^^^^^^^^^^^^
    |
    = help: try changing either arm body
 help: or try merging the arm patterns and removing the obsolete arm
@@ -30,7 +30,7 @@ error: this match arm has an identical body to another arm
   --> tests/ui/match_same_arms.rs:25:9
    |
 LL |         51 => 1,
-   |         ^^^^^^^
+   |         ^^^^^^^^
    |
    = help: try changing either arm body
 help: or try merging the arm patterns and removing the obsolete arm
@@ -44,7 +44,7 @@ error: this match arm has an identical body to another arm
   --> tests/ui/match_same_arms.rs:26:9
    |
 LL |         41 => 2,
-   |         ^^^^^^^
+   |         ^^^^^^^^
    |
    = help: try changing either arm body
 help: or try merging the arm patterns and removing the obsolete arm
@@ -57,7 +57,7 @@ error: this match arm has an identical body to another arm
   --> tests/ui/match_same_arms.rs:33:9
    |
 LL |         2 => 2,
-   |         ^^^^^^
+   |         ^^^^^^^
    |
    = help: try changing either arm body
 help: or try merging the arm patterns and removing the obsolete arm
@@ -71,7 +71,7 @@ error: this match arm has an identical body to another arm
   --> tests/ui/match_same_arms.rs:35:9
    |
 LL |         3 => 2,
-   |         ^^^^^^
+   |         ^^^^^^^
    |
    = help: try changing either arm body
 help: or try merging the arm patterns and removing the obsolete arm
@@ -85,7 +85,7 @@ error: this match arm has an identical body to another arm
   --> tests/ui/match_same_arms.rs:33:9
    |
 LL |         2 => 2,
-   |         ^^^^^^
+   |         ^^^^^^^
    |
    = help: try changing either arm body
 help: or try merging the arm patterns and removing the obsolete arm
@@ -99,7 +99,7 @@ error: this match arm has an identical body to another arm
   --> tests/ui/match_same_arms.rs:52:17
    |
 LL |                 CommandInfo::External { name, .. } => name.to_string(),
-   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: try changing either arm body
 help: or try merging the arm patterns and removing the obsolete arm
diff --git a/src/tools/clippy/tests/ui/match_same_arms2.stderr b/src/tools/clippy/tests/ui/match_same_arms2.stderr
@@ -21,15 +21,15 @@ LL | |             if true {
 ...  |
 LL | |             a
 LL | |         },
-   | |_________^
+   | |__________^
    = note: `-D clippy::match-same-arms` implied by `-D warnings`
    = help: to override `-D warnings` add `#[allow(clippy::match_same_arms)]`
 
 error: this match arm has an identical body to another arm
   --> tests/ui/match_same_arms2.rs:40:9
    |
 LL |         51 => foo(),
-   |         ^^^^^^^^^^^
+   |         ^^^^^^^^^^^^
    |
    = help: try changing either arm body
 help: or try merging the arm patterns and removing the obsolete arm
@@ -43,7 +43,7 @@ error: this match arm has an identical body to another arm
   --> tests/ui/match_same_arms2.rs:46:9
    |
 LL |         None => 24,
-   |         ^^^^^^^^^^
+   |         ^^^^^^^^^^^
    |
    = help: try changing either arm body
 help: or try merging the arm patterns and removing the obsolete arm
@@ -57,7 +57,7 @@ error: this match arm has an identical body to another arm
   --> tests/ui/match_same_arms2.rs:68:9
    |
 LL |         (None, Some(a)) => bar(a),
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: try changing either arm body
 help: or try merging the arm patterns and removing the obsolete arm
@@ -71,7 +71,7 @@ error: this match arm has an identical body to another arm
   --> tests/ui/match_same_arms2.rs:82:9
    |
 LL |         (None, Some(a)) if a == 42 => a,
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: try changing either arm body
 help: or try merging the arm patterns and removing the obsolete arm
@@ -85,7 +85,7 @@ error: this match arm has an identical body to another arm
   --> tests/ui/match_same_arms2.rs:87:9
    |
 LL |         (Some(a), ..) => bar(a),
-   |         ^^^^^^^^^^^^^^^^^^^^^^^
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: try changing either arm body
 help: or try merging the arm patterns and removing the obsolete arm
@@ -98,7 +98,7 @@ error: this match arm has an identical body to another arm
   --> tests/ui/match_same_arms2.rs:121:9
    |
 LL |         (Ok(x), Some(_)) => println!("ok {}", x),
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: try changing either arm body
 help: or try merging the arm patterns and removing the obsolete arm
@@ -111,7 +111,7 @@ error: this match arm has an identical body to another arm
   --> tests/ui/match_same_arms2.rs:137:9
    |
 LL |         Ok(_) => println!("ok"),
-   |         ^^^^^^^^^^^^^^^^^^^^^^^
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: try changing either arm body
 help: or try merging the arm patterns and removing the obsolete arm
@@ -127,7 +127,7 @@ error: this match arm has an identical body to another arm
 LL | /         1 => {
 LL | |             empty!(0);
 LL | |         },
-   | |_________^
+   | |__________^
    |
    = help: try changing either arm body
 help: or try merging the arm patterns and removing the obsolete arm
@@ -143,7 +143,7 @@ error: this match arm has an identical body to another arm
   --> tests/ui/match_same_arms2.rs:215:9
    |
 LL |         Foo::X(0) => 1,
-   |         ^^^^^^^^^^^^^^
+   |         ^^^^^^^^^^^^^^^
    |
    = help: try changing either arm body
 help: or try merging the arm patterns and removing the obsolete arm
@@ -157,7 +157,7 @@ error: this match arm has an identical body to another arm
   --> tests/ui/match_same_arms2.rs:225:9
    |
 LL |         Foo::Z(_) => 1,
-   |         ^^^^^^^^^^^^^^
+   |         ^^^^^^^^^^^^^^^
    |
    = help: try changing either arm body
 help: or try merging the arm patterns and removing the obsolete arm
@@ -170,7 +170,7 @@ error: this match arm has an identical body to another arm
   --> tests/ui/match_same_arms2.rs:248:9
    |
 LL |         Some(Bar { y: 0, x: 5, .. }) => 1,
-   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: try changing either arm body
 help: or try merging the arm patterns and removing the obsolete arm
@@ -184,7 +184,7 @@ error: this match arm has an identical body to another arm
   --> tests/ui/match_same_arms2.rs:262:9
    |
 LL |         1 => cfg!(not_enable),
-   |         ^^^^^^^^^^^^^^^^^^^^^
+   |         ^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: try changing either arm body
 help: or try merging the arm patterns and removing the obsolete arm
@@ -198,7 +198,7 @@ error: this match arm has an identical body to another arm
   --> tests/ui/match_same_arms2.rs:278:17
    |
 LL |                 MaybeStaticStr::Borrowed(s) => s,
-   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |                 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: try changing either arm body
 help: or try merging the arm patterns and removing the obsolete arm
diff --git a/src/tools/clippy/tests/ui/match_same_arms_non_exhaustive.stderr b/src/tools/clippy/tests/ui/match_same_arms_non_exhaustive.stderr
@@ -10,7 +10,7 @@ note: `_` wildcard arm here
   --> tests/ui/match_same_arms_non_exhaustive.rs:46:9
    |
 LL |         _ => repeat(),
-   |         ^^^^^^^^^^^^^
+   |         ^^^^^^^^^^^^^^
    = note: `-D clippy::match-same-arms` implied by `-D warnings`
    = help: to override `-D warnings` add `#[allow(clippy::match_same_arms)]`
 
@@ -26,7 +26,7 @@ note: `_` wildcard arm here
   --> tests/ui/match_same_arms_non_exhaustive.rs:60:13
    |
 LL |             _ => repeat(),
-   |             ^^^^^^^^^^^^^
+   |             ^^^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
 

Original file line number	Diff line number	Diff line change
@@ -9,15 +9,15 @@ note: `_` wildcard arm here
`9`	`9`	`--> tests/ui/match_same_arms.rs:14:9`
`10`	`10`	`\|`
`11`	`11`	`LL \| _ => 0,`
`12`		`- \| ^^^^^^`
	`12`	`+ \| ^^^^^^^`
`13`	`13`	= note: `-D clippy::match-same-arms` implied by `-D warnings`
`14`	`14`	= help: to override `-D warnings` add `#[allow(clippy::match_same_arms)]`
`15`	`15`
`16`	`16`	`error: this match arm has an identical body to another arm`
`17`	`17`	`--> tests/ui/match_same_arms.rs:18:9`
`18`	`18`	`\|`
`19`	`19`	`LL \| (1, .., 3) => 42,`
`20`		`- \| ^^^^^^^^^^^^^^^^`
	`20`	`+ \| ^^^^^^^^^^^^^^^^^`
`21`	`21`	`\|`
`22`	`22`	`= help: try changing either arm body`
`23`	`23`	`help: or try merging the arm patterns and removing the obsolete arm`
`@@ -30,7 +30,7 @@ error: this match arm has an identical body to another arm`
`30`	`30`	`--> tests/ui/match_same_arms.rs:25:9`
`31`	`31`	`\|`
`32`	`32`	`LL \| 51 => 1,`
`33`		`- \| ^^^^^^^`
	`33`	`+ \| ^^^^^^^^`
`34`	`34`	`\|`
`35`	`35`	`= help: try changing either arm body`
`36`	`36`	`help: or try merging the arm patterns and removing the obsolete arm`
`@@ -44,7 +44,7 @@ error: this match arm has an identical body to another arm`
`44`	`44`	`--> tests/ui/match_same_arms.rs:26:9`
`45`	`45`	`\|`
`46`	`46`	`LL \| 41 => 2,`
`47`		`- \| ^^^^^^^`
	`47`	`+ \| ^^^^^^^^`
`48`	`48`	`\|`
`49`	`49`	`= help: try changing either arm body`
`50`	`50`	`help: or try merging the arm patterns and removing the obsolete arm`
`@@ -57,7 +57,7 @@ error: this match arm has an identical body to another arm`
`57`	`57`	`--> tests/ui/match_same_arms.rs:33:9`
`58`	`58`	`\|`
`59`	`59`	`LL \| 2 => 2,`
`60`		`- \| ^^^^^^`
	`60`	`+ \| ^^^^^^^`
`61`	`61`	`\|`
`62`	`62`	`= help: try changing either arm body`
`63`	`63`	`help: or try merging the arm patterns and removing the obsolete arm`
`@@ -71,7 +71,7 @@ error: this match arm has an identical body to another arm`
`71`	`71`	`--> tests/ui/match_same_arms.rs:35:9`
`72`	`72`	`\|`
`73`	`73`	`LL \| 3 => 2,`
`74`		`- \| ^^^^^^`
	`74`	`+ \| ^^^^^^^`
`75`	`75`	`\|`
`76`	`76`	`= help: try changing either arm body`
`77`	`77`	`help: or try merging the arm patterns and removing the obsolete arm`
`@@ -85,7 +85,7 @@ error: this match arm has an identical body to another arm`
`85`	`85`	`--> tests/ui/match_same_arms.rs:33:9`
`86`	`86`	`\|`
`87`	`87`	`LL \| 2 => 2,`
`88`		`- \| ^^^^^^`
	`88`	`+ \| ^^^^^^^`
`89`	`89`	`\|`
`90`	`90`	`= help: try changing either arm body`
`91`	`91`	`help: or try merging the arm patterns and removing the obsolete arm`
`@@ -99,7 +99,7 @@ error: this match arm has an identical body to another arm`
`99`	`99`	`--> tests/ui/match_same_arms.rs:52:17`
`100`	`100`	`\|`
`101`	`101`	`LL \| CommandInfo::External { name, .. } => name.to_string(),`
`102`		`- \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
	`102`	`+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`103`	`103`	`\|`
`104`	`104`	`= help: try changing either arm body`
`105`	`105`	`help: or try merging the arm patterns and removing the obsolete arm`
Original file line number	Diff line number	Diff line change
`@@ -21,15 +21,15 @@ LL \| \| if true {`
`21`	`21`	`... \|`
`22`	`22`	`LL \| \| a`
`23`	`23`	`LL \| \| },`
`24`		`- \| \|_________^`
	`24`	`+ \| \|__________^`
`25`	`25`	= note: `-D clippy::match-same-arms` implied by `-D warnings`
`26`	`26`	= help: to override `-D warnings` add `#[allow(clippy::match_same_arms)]`
`27`	`27`
`28`	`28`	`error: this match arm has an identical body to another arm`
`29`	`29`	`--> tests/ui/match_same_arms2.rs:40:9`
`30`	`30`	`\|`
`31`	`31`	`LL \| 51 => foo(),`
`32`		`- \| ^^^^^^^^^^^`
	`32`	`+ \| ^^^^^^^^^^^^`
`33`	`33`	`\|`
`34`	`34`	`= help: try changing either arm body`
`35`	`35`	`help: or try merging the arm patterns and removing the obsolete arm`
`@@ -43,7 +43,7 @@ error: this match arm has an identical body to another arm`
`43`	`43`	`--> tests/ui/match_same_arms2.rs:46:9`
`44`	`44`	`\|`
`45`	`45`	`LL \| None => 24,`
`46`		`- \| ^^^^^^^^^^`
	`46`	`+ \| ^^^^^^^^^^^`
`47`	`47`	`\|`
`48`	`48`	`= help: try changing either arm body`
`49`	`49`	`help: or try merging the arm patterns and removing the obsolete arm`
`@@ -57,7 +57,7 @@ error: this match arm has an identical body to another arm`
`57`	`57`	`--> tests/ui/match_same_arms2.rs:68:9`
`58`	`58`	`\|`
`59`	`59`	`LL \| (None, Some(a)) => bar(a),`
`60`		`- \| ^^^^^^^^^^^^^^^^^^^^^^^^^`
	`60`	`+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^`
`61`	`61`	`\|`
`62`	`62`	`= help: try changing either arm body`
`63`	`63`	`help: or try merging the arm patterns and removing the obsolete arm`
`@@ -71,7 +71,7 @@ error: this match arm has an identical body to another arm`
`71`	`71`	`--> tests/ui/match_same_arms2.rs:82:9`
`72`	`72`	`\|`
`73`	`73`	`LL \| (None, Some(a)) if a == 42 => a,`
`74`		`- \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
	`74`	`+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`75`	`75`	`\|`
`76`	`76`	`= help: try changing either arm body`
`77`	`77`	`help: or try merging the arm patterns and removing the obsolete arm`
`@@ -85,7 +85,7 @@ error: this match arm has an identical body to another arm`
`85`	`85`	`--> tests/ui/match_same_arms2.rs:87:9`
`86`	`86`	`\|`
`87`	`87`	`LL \| (Some(a), ..) => bar(a),`
`88`		`- \| ^^^^^^^^^^^^^^^^^^^^^^^`
	`88`	`+ \| ^^^^^^^^^^^^^^^^^^^^^^^^`
`89`	`89`	`\|`
`90`	`90`	`= help: try changing either arm body`
`91`	`91`	`help: or try merging the arm patterns and removing the obsolete arm`
`@@ -98,7 +98,7 @@ error: this match arm has an identical body to another arm`
`98`	`98`	`--> tests/ui/match_same_arms2.rs:121:9`
`99`	`99`	`\|`
`100`	`100`	`LL \| (Ok(x), Some(_)) => println!("ok {}", x),`
`101`		`- \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
	`101`	`+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`102`	`102`	`\|`
`103`	`103`	`= help: try changing either arm body`
`104`	`104`	`help: or try merging the arm patterns and removing the obsolete arm`
`@@ -111,7 +111,7 @@ error: this match arm has an identical body to another arm`
`111`	`111`	`--> tests/ui/match_same_arms2.rs:137:9`
`112`	`112`	`\|`
`113`	`113`	`LL \| Ok(_) => println!("ok"),`
`114`		`- \| ^^^^^^^^^^^^^^^^^^^^^^^`
	`114`	`+ \| ^^^^^^^^^^^^^^^^^^^^^^^^`
`115`	`115`	`\|`
`116`	`116`	`= help: try changing either arm body`
`117`	`117`	`help: or try merging the arm patterns and removing the obsolete arm`
`@@ -127,7 +127,7 @@ error: this match arm has an identical body to another arm`
`127`	`127`	`LL \| / 1 => {`
`128`	`128`	`LL \| \| empty!(0);`
`129`	`129`	`LL \| \| },`
`130`		`- \| \|_________^`
	`130`	`+ \| \|__________^`
`131`	`131`	`\|`
`132`	`132`	`= help: try changing either arm body`
`133`	`133`	`help: or try merging the arm patterns and removing the obsolete arm`
`@@ -143,7 +143,7 @@ error: this match arm has an identical body to another arm`
`143`	`143`	`--> tests/ui/match_same_arms2.rs:215:9`
`144`	`144`	`\|`
`145`	`145`	`LL \| Foo::X(0) => 1,`
`146`		`- \| ^^^^^^^^^^^^^^`
	`146`	`+ \| ^^^^^^^^^^^^^^^`
`147`	`147`	`\|`
`148`	`148`	`= help: try changing either arm body`
`149`	`149`	`help: or try merging the arm patterns and removing the obsolete arm`
`@@ -157,7 +157,7 @@ error: this match arm has an identical body to another arm`
`157`	`157`	`--> tests/ui/match_same_arms2.rs:225:9`
`158`	`158`	`\|`
`159`	`159`	`LL \| Foo::Z(_) => 1,`
`160`		`- \| ^^^^^^^^^^^^^^`
	`160`	`+ \| ^^^^^^^^^^^^^^^`
`161`	`161`	`\|`
`162`	`162`	`= help: try changing either arm body`
`163`	`163`	`help: or try merging the arm patterns and removing the obsolete arm`
`@@ -170,7 +170,7 @@ error: this match arm has an identical body to another arm`
`170`	`170`	`--> tests/ui/match_same_arms2.rs:248:9`
`171`	`171`	`\|`
`172`	`172`	`LL \| Some(Bar { y: 0, x: 5, .. }) => 1,`
`173`		`- \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
	`173`	`+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`174`	`174`	`\|`
`175`	`175`	`= help: try changing either arm body`
`176`	`176`	`help: or try merging the arm patterns and removing the obsolete arm`
`@@ -184,7 +184,7 @@ error: this match arm has an identical body to another arm`
`184`	`184`	`--> tests/ui/match_same_arms2.rs:262:9`
`185`	`185`	`\|`
`186`	`186`	`LL \| 1 => cfg!(not_enable),`
`187`		`- \| ^^^^^^^^^^^^^^^^^^^^^`
	`187`	`+ \| ^^^^^^^^^^^^^^^^^^^^^^`
`188`	`188`	`\|`
`189`	`189`	`= help: try changing either arm body`
`190`	`190`	`help: or try merging the arm patterns and removing the obsolete arm`
`@@ -198,7 +198,7 @@ error: this match arm has an identical body to another arm`
`198`	`198`	`--> tests/ui/match_same_arms2.rs:278:17`
`199`	`199`	`\|`
`200`	`200`	`LL \| MaybeStaticStr::Borrowed(s) => s,`
`201`		`- \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
	`201`	`+ \| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^`
`202`	`202`	`\|`
`203`	`203`	`= help: try changing either arm body`
`204`	`204`	`help: or try merging the arm patterns and removing the obsolete arm`
Original file line number	Diff line number	Diff line change
@@ -10,7 +10,7 @@ note: `_` wildcard arm here
`10`	`10`	`--> tests/ui/match_same_arms_non_exhaustive.rs:46:9`
`11`	`11`	`\|`
`12`	`12`	`LL \| _ => repeat(),`
`13`		`- \| ^^^^^^^^^^^^^`
	`13`	`+ \| ^^^^^^^^^^^^^^`
`14`	`14`	= note: `-D clippy::match-same-arms` implied by `-D warnings`
`15`	`15`	= help: to override `-D warnings` add `#[allow(clippy::match_same_arms)]`
`16`	`16`
@@ -26,7 +26,7 @@ note: `_` wildcard arm here
`26`	`26`	`--> tests/ui/match_same_arms_non_exhaustive.rs:60:13`
`27`	`27`	`\|`
`28`	`28`	`LL \| _ => repeat(),`
`29`		`- \| ^^^^^^^^^^^^^`
	`29`	`+ \| ^^^^^^^^^^^^^^`
`30`	`30`
`31`	`31`	`error: aborting due to 2 previous errors`
`32`	`32`