Skip to content

Commit

Permalink
Auto merge of rust-lang#88493 - chenyukang:fix-duplicated-diagnostic,…
Browse files Browse the repository at this point in the history
… r=estebank

Fix rust-lang#88256 remove duplicated diagnostics

Fix rust-lang#88256
  • Loading branch information
bors committed Sep 6, 2021
2 parents ad8610d + 6764fde commit f7aaa2a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 33 deletions.
20 changes: 1 addition & 19 deletions tests/ui/match_same_arms.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -106,24 +106,6 @@ LL | 1 => 2,
| ^
= help: ...or consider changing the match arm bodies

error: this `match` has identical arm bodies
--> $DIR/match_same_arms.rs:33:14
|
LL | 3 => 2, //~ ERROR 3rd matched arms have same body
| ^
|
note: same as this
--> $DIR/match_same_arms.rs:32:14
|
LL | 2 => 2, //~ ERROR 2nd matched arms have same body
| ^
help: consider refactoring into `2 | 3`
--> $DIR/match_same_arms.rs:32:9
|
LL | 2 => 2, //~ ERROR 2nd matched arms have same body
| ^
= help: ...or consider changing the match arm bodies

error: this `match` has identical arm bodies
--> $DIR/match_same_arms.rs:50:55
|
Expand All @@ -142,5 +124,5 @@ LL | CommandInfo::BuiltIn { name, .. } => name.to_string(),
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
= help: ...or consider changing the match arm bodies

error: aborting due to 8 previous errors
error: aborting due to 7 previous errors

8 changes: 1 addition & 7 deletions tests/ui/modulo_one.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,6 @@ LL | const ONE: u32 = 1 * 1;
|
= note: `-D clippy::identity-op` implied by `-D warnings`

error: the operation is ineffective. Consider reducing it to `1`
--> $DIR/modulo_one.rs:13:22
|
LL | const ONE: u32 = 1 * 1;
| ^^^^^

error: any number modulo 1 will be 0
--> $DIR/modulo_one.rs:17:5
|
Expand All @@ -70,5 +64,5 @@ error: any number modulo -1 will panic/overflow or result in 0
LL | INT_MIN % NEG_ONE; // also caught by rustc
| ^^^^^^^^^^^^^^^^^

error: aborting due to 11 previous errors
error: aborting due to 10 previous errors

8 changes: 1 addition & 7 deletions tests/ui/suspicious_operation_groupings.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@ LL | self.x == other.y && self.y == other.y && self.z == other.z
|
= note: `-D clippy::suspicious-operation-groupings` implied by `-D warnings`

error: this sequence of operators looks suspiciously like a bug
--> $DIR/suspicious_operation_groupings.rs:14:9
|
LL | self.x == other.y && self.y == other.y && self.z == other.z
| ^^^^^^^^^^^^^^^^^ help: did you mean: `self.x == other.x`

error: this sequence of operators looks suspiciously like a bug
--> $DIR/suspicious_operation_groupings.rs:27:20
|
Expand Down Expand Up @@ -162,5 +156,5 @@ error: this sequence of operators looks suspiciously like a bug
LL | -(if -s1.a < -s2.a && -s1.a < -s2.b { s1.c } else { s2.a })
| ^^^^^^^^^^^^^ help: did you mean: `-s1.b < -s2.b`

error: aborting due to 27 previous errors
error: aborting due to 26 previous errors

0 comments on commit f7aaa2a

Please sign in to comment.