Skip to content

Commit 6d0b5e2

Browse files
committed
update test stderr
1 parent f59ec19 commit 6d0b5e2

4 files changed

+22
-22
lines changed

tests/ui/checked_unwrap/complex_conditionals.stderr

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: you checked before that `unwrap()` cannot fail. Instead of checking and unwrapping, it's better to use `if let` or `match`
1+
error: you checked before that `unwrap()` cannot fail, instead of checking and unwrapping, it's better to use `if let` or `match`
22
--> $DIR/complex_conditionals.rs:8:9
33
|
44
LL | if x.is_ok() && y.is_err() {
@@ -36,7 +36,7 @@ LL | if x.is_ok() && y.is_err() {
3636
LL | y.unwrap(); // will panic
3737
| ^^^^^^^^^^
3838

39-
error: you checked before that `unwrap_err()` cannot fail. Instead of checking and unwrapping, it's better to use `if let` or `match`
39+
error: you checked before that `unwrap_err()` cannot fail, instead of checking and unwrapping, it's better to use `if let` or `match`
4040
--> $DIR/complex_conditionals.rs:11:9
4141
|
4242
LL | if x.is_ok() && y.is_err() {
@@ -54,7 +54,7 @@ LL | if x.is_ok() || y.is_ok() {
5454
LL | x.unwrap(); // will panic
5555
| ^^^^^^^^^^
5656

57-
error: you checked before that `unwrap_err()` cannot fail. Instead of checking and unwrapping, it's better to use `if let` or `match`
57+
error: you checked before that `unwrap_err()` cannot fail, instead of checking and unwrapping, it's better to use `if let` or `match`
5858
--> $DIR/complex_conditionals.rs:26:9
5959
|
6060
LL | if x.is_ok() || y.is_ok() {
@@ -72,7 +72,7 @@ LL | if x.is_ok() || y.is_ok() {
7272
LL | y.unwrap(); // will panic
7373
| ^^^^^^^^^^
7474

75-
error: you checked before that `unwrap_err()` cannot fail. Instead of checking and unwrapping, it's better to use `if let` or `match`
75+
error: you checked before that `unwrap_err()` cannot fail, instead of checking and unwrapping, it's better to use `if let` or `match`
7676
--> $DIR/complex_conditionals.rs:28:9
7777
|
7878
LL | if x.is_ok() || y.is_ok() {
@@ -81,7 +81,7 @@ LL | if x.is_ok() || y.is_ok() {
8181
LL | y.unwrap_err(); // unnecessary
8282
| ^^^^^^^^^^^^^^
8383

84-
error: you checked before that `unwrap()` cannot fail. Instead of checking and unwrapping, it's better to use `if let` or `match`
84+
error: you checked before that `unwrap()` cannot fail, instead of checking and unwrapping, it's better to use `if let` or `match`
8585
--> $DIR/complex_conditionals.rs:32:9
8686
|
8787
LL | if x.is_ok() && !(y.is_ok() || z.is_err()) {
@@ -107,7 +107,7 @@ LL | if x.is_ok() && !(y.is_ok() || z.is_err()) {
107107
LL | y.unwrap(); // will panic
108108
| ^^^^^^^^^^
109109

110-
error: you checked before that `unwrap_err()` cannot fail. Instead of checking and unwrapping, it's better to use `if let` or `match`
110+
error: you checked before that `unwrap_err()` cannot fail, instead of checking and unwrapping, it's better to use `if let` or `match`
111111
--> $DIR/complex_conditionals.rs:35:9
112112
|
113113
LL | if x.is_ok() && !(y.is_ok() || z.is_err()) {
@@ -116,7 +116,7 @@ LL | if x.is_ok() && !(y.is_ok() || z.is_err()) {
116116
LL | y.unwrap_err(); // unnecessary
117117
| ^^^^^^^^^^^^^^
118118

119-
error: you checked before that `unwrap()` cannot fail. Instead of checking and unwrapping, it's better to use `if let` or `match`
119+
error: you checked before that `unwrap()` cannot fail, instead of checking and unwrapping, it's better to use `if let` or `match`
120120
--> $DIR/complex_conditionals.rs:36:9
121121
|
122122
LL | if x.is_ok() && !(y.is_ok() || z.is_err()) {
@@ -143,7 +143,7 @@ LL | if x.is_ok() || !(y.is_ok() && z.is_err()) {
143143
LL | x.unwrap(); // will panic
144144
| ^^^^^^^^^^
145145

146-
error: you checked before that `unwrap_err()` cannot fail. Instead of checking and unwrapping, it's better to use `if let` or `match`
146+
error: you checked before that `unwrap_err()` cannot fail, instead of checking and unwrapping, it's better to use `if let` or `match`
147147
--> $DIR/complex_conditionals.rs:46:9
148148
|
149149
LL | if x.is_ok() || !(y.is_ok() && z.is_err()) {
@@ -152,7 +152,7 @@ LL | if x.is_ok() || !(y.is_ok() && z.is_err()) {
152152
LL | x.unwrap_err(); // unnecessary
153153
| ^^^^^^^^^^^^^^
154154

155-
error: you checked before that `unwrap()` cannot fail. Instead of checking and unwrapping, it's better to use `if let` or `match`
155+
error: you checked before that `unwrap()` cannot fail, instead of checking and unwrapping, it's better to use `if let` or `match`
156156
--> $DIR/complex_conditionals.rs:47:9
157157
|
158158
LL | if x.is_ok() || !(y.is_ok() && z.is_err()) {
@@ -179,7 +179,7 @@ LL | if x.is_ok() || !(y.is_ok() && z.is_err()) {
179179
LL | z.unwrap(); // will panic
180180
| ^^^^^^^^^^
181181

182-
error: you checked before that `unwrap_err()` cannot fail. Instead of checking and unwrapping, it's better to use `if let` or `match`
182+
error: you checked before that `unwrap_err()` cannot fail, instead of checking and unwrapping, it's better to use `if let` or `match`
183183
--> $DIR/complex_conditionals.rs:50:9
184184
|
185185
LL | if x.is_ok() || !(y.is_ok() && z.is_err()) {

tests/ui/checked_unwrap/complex_conditionals_nested.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: you checked before that `unwrap()` cannot fail. Instead of checking and unwrapping, it's better to use `if let` or `match`
1+
error: you checked before that `unwrap()` cannot fail, instead of checking and unwrapping, it's better to use `if let` or `match`
22
--> $DIR/complex_conditionals_nested.rs:8:13
33
|
44
LL | if x.is_some() {

tests/ui/checked_unwrap/simple_conditionals.stderr

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: you checked before that `unwrap()` cannot fail. Instead of checking and unwrapping, it's better to use `if let` or `match`
1+
error: you checked before that `unwrap()` cannot fail, instead of checking and unwrapping, it's better to use `if let` or `match`
22
--> $DIR/simple_conditionals.rs:39:9
33
|
44
LL | if x.is_some() {
@@ -35,7 +35,7 @@ LL | if x.is_none() {
3535
LL | x.unwrap(); // will panic
3636
| ^^^^^^^^^^
3737

38-
error: you checked before that `unwrap()` cannot fail. Instead of checking and unwrapping, it's better to use `if let` or `match`
38+
error: you checked before that `unwrap()` cannot fail, instead of checking and unwrapping, it's better to use `if let` or `match`
3939
--> $DIR/simple_conditionals.rs:46:9
4040
|
4141
LL | if x.is_none() {
@@ -44,7 +44,7 @@ LL | if x.is_none() {
4444
LL | x.unwrap(); // unnecessary
4545
| ^^^^^^^^^^
4646

47-
error: you checked before that `unwrap()` cannot fail. Instead of checking and unwrapping, it's better to use `if let` or `match`
47+
error: you checked before that `unwrap()` cannot fail, instead of checking and unwrapping, it's better to use `if let` or `match`
4848
--> $DIR/simple_conditionals.rs:7:13
4949
|
5050
LL | if $a.is_some() {
@@ -57,7 +57,7 @@ LL | m!(x);
5757
|
5858
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
5959

60-
error: you checked before that `unwrap()` cannot fail. Instead of checking and unwrapping, it's better to use `if let` or `match`
60+
error: you checked before that `unwrap()` cannot fail, instead of checking and unwrapping, it's better to use `if let` or `match`
6161
--> $DIR/simple_conditionals.rs:54:9
6262
|
6363
LL | if x.is_ok() {
@@ -83,7 +83,7 @@ LL | if x.is_ok() {
8383
LL | x.unwrap(); // will panic
8484
| ^^^^^^^^^^
8585

86-
error: you checked before that `unwrap_err()` cannot fail. Instead of checking and unwrapping, it's better to use `if let` or `match`
86+
error: you checked before that `unwrap_err()` cannot fail, instead of checking and unwrapping, it's better to use `if let` or `match`
8787
--> $DIR/simple_conditionals.rs:58:9
8888
|
8989
LL | if x.is_ok() {
@@ -100,7 +100,7 @@ LL | if x.is_err() {
100100
LL | x.unwrap(); // will panic
101101
| ^^^^^^^^^^
102102

103-
error: you checked before that `unwrap_err()` cannot fail. Instead of checking and unwrapping, it's better to use `if let` or `match`
103+
error: you checked before that `unwrap_err()` cannot fail, instead of checking and unwrapping, it's better to use `if let` or `match`
104104
--> $DIR/simple_conditionals.rs:62:9
105105
|
106106
LL | if x.is_err() {
@@ -109,7 +109,7 @@ LL | x.unwrap(); // will panic
109109
LL | x.unwrap_err(); // unnecessary
110110
| ^^^^^^^^^^^^^^
111111

112-
error: you checked before that `unwrap()` cannot fail. Instead of checking and unwrapping, it's better to use `if let` or `match`
112+
error: you checked before that `unwrap()` cannot fail, instead of checking and unwrapping, it's better to use `if let` or `match`
113113
--> $DIR/simple_conditionals.rs:64:9
114114
|
115115
LL | if x.is_err() {

tests/ui/neg_cmp_op_on_partial_ord.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
error: the use of negated comparison operators on partially ordered types produces code that is hard to read and refactor. Please consider using the `partial_cmp` method instead, to make it clear that the two values could be incomparable.
1+
error: the use of negated comparison operators on partially ordered types produces code that is hard to read and refactor, please consider using the `partial_cmp` method instead, to make it clear that the two values could be incomparable
22
--> $DIR/neg_cmp_op_on_partial_ord.rs:16:21
33
|
44
LL | let _not_less = !(a_value < another_value);
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
77
= note: `-D clippy::neg-cmp-op-on-partial-ord` implied by `-D warnings`
88

9-
error: the use of negated comparison operators on partially ordered types produces code that is hard to read and refactor. Please consider using the `partial_cmp` method instead, to make it clear that the two values could be incomparable.
9+
error: the use of negated comparison operators on partially ordered types produces code that is hard to read and refactor, please consider using the `partial_cmp` method instead, to make it clear that the two values could be incomparable
1010
--> $DIR/neg_cmp_op_on_partial_ord.rs:19:30
1111
|
1212
LL | let _not_less_or_equal = !(a_value <= another_value);
1313
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
1414

15-
error: the use of negated comparison operators on partially ordered types produces code that is hard to read and refactor. Please consider using the `partial_cmp` method instead, to make it clear that the two values could be incomparable.
15+
error: the use of negated comparison operators on partially ordered types produces code that is hard to read and refactor, please consider using the `partial_cmp` method instead, to make it clear that the two values could be incomparable
1616
--> $DIR/neg_cmp_op_on_partial_ord.rs:22:24
1717
|
1818
LL | let _not_greater = !(a_value > another_value);
1919
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
2020

21-
error: the use of negated comparison operators on partially ordered types produces code that is hard to read and refactor. Please consider using the `partial_cmp` method instead, to make it clear that the two values could be incomparable.
21+
error: the use of negated comparison operators on partially ordered types produces code that is hard to read and refactor, please consider using the `partial_cmp` method instead, to make it clear that the two values could be incomparable
2222
--> $DIR/neg_cmp_op_on_partial_ord.rs:25:33
2323
|
2424
LL | let _not_greater_or_equal = !(a_value >= another_value);

0 commit comments

Comments
 (0)