Skip to content

Commit 10e6db2

Browse files
compiler-errorscompiler-errors
committed
Bless tests
1 parent fc7f6e1 commit 10e6db2

File tree

8 files changed

+49
-53
lines changed

8 files changed

+49
-53
lines changed

‎tests/target/configs/single_line_let_else_max_width/100.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ fn main() {
99

1010
let Some(c) = opt else {
1111
// a comment should always force the block to be multi-lined
12-
return;
12+
return
1313
};
1414

1515
let Some(c) = opt else {
1616
/* a comment should always force the block to be multi-lined */
17-
return;
17+
return
1818
};
1919

2020
let Some(d) = some_very_very_very_very_long_name else { return };
@@ -26,23 +26,23 @@ fn main() {
2626
range: _,
2727
}) = slice.as_ref()
2828
else {
29-
return;
29+
return
3030
};
3131

3232
let Some((base_place, current)) = self.lower_expr_as_place(current, *base, true)? else {
33-
return Ok(None);
33+
return Ok(None)
3434
};
3535

3636
let Some(doc_attr) = variant
3737
.attrs
3838
.iter()
3939
.find(|attr| attr.path().is_ident("doc"))
4040
else {
41-
return Err(Error::new(variant.span(), r#"expected a doc comment"#));
41+
return Err(Error::new(variant.span(), r#"expected a doc comment"#))
4242
};
4343

4444
let Some((base_place, current)) = self.lower_expr_as_place(current, *base, true) else {
45-
return Ok(None);
45+
return Ok(None)
4646
};
4747

4848
let Stmt::Expr(
@@ -55,6 +55,6 @@ fn main() {
5555
return Err(Error::new(
5656
last_stmt.span(),
5757
"expected last expression to be `Some(match (..) { .. })`",
58-
));
58+
))
5959
};
6060
}

‎tests/target/configs/single_line_let_else_max_width/50.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ fn main() {
99

1010
let Some(c) = opt else {
1111
// a comment should always force the block to be multi-lined
12-
return;
12+
return
1313
};
1414

1515
let Some(c) = opt else {
1616
/* a comment should always force the block to be multi-lined */
17-
return;
17+
return
1818
};
1919

2020
let Some(d) = some_very_very_very_very_long_name else {
21-
return;
21+
return
2222
};
2323

2424
let Expr::Slice(ast::ExprSlice {
@@ -28,23 +28,23 @@ fn main() {
2828
range: _,
2929
}) = slice.as_ref()
3030
else {
31-
return;
31+
return
3232
};
3333

3434
let Some((base_place, current)) = self.lower_expr_as_place(current, *base, true)? else {
35-
return Ok(None);
35+
return Ok(None)
3636
};
3737

3838
let Some(doc_attr) = variant
3939
.attrs
4040
.iter()
4141
.find(|attr| attr.path().is_ident("doc"))
4242
else {
43-
return Err(Error::new(variant.span(), r#"expected a doc comment"#));
43+
return Err(Error::new(variant.span(), r#"expected a doc comment"#))
4444
};
4545

4646
let Some((base_place, current)) = self.lower_expr_as_place(current, *base, true) else {
47-
return Ok(None);
47+
return Ok(None)
4848
};
4949

5050
let Stmt::Expr(
@@ -57,6 +57,6 @@ fn main() {
5757
return Err(Error::new(
5858
last_stmt.span(),
5959
"expected last expression to be `Some(match (..) { .. })`",
60-
));
60+
))
6161
};
6262
}

‎tests/target/configs/single_line_let_else_max_width/zero.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@ fn main() {
44
let Some(a) = opt else {};
55

66
let Some(b) = opt else {
7-
return;
7+
return
88
};
99

1010
let Some(c) = opt else {
11-
return;
11+
return
1212
};
1313

1414
let Some(c) = opt else {
1515
// a comment should always force the block to be multi-lined
16-
return;
16+
return
1717
};
1818

1919
let Some(c) = opt else {
2020
/* a comment should always force the block to be multi-lined */
21-
return;
21+
return
2222
};
2323

2424
let Some(d) = some_very_very_very_very_long_name else {
25-
return;
25+
return
2626
};
2727

2828
let Expr::Slice(ast::ExprSlice {
@@ -32,23 +32,23 @@ fn main() {
3232
range: _,
3333
}) = slice.as_ref()
3434
else {
35-
return;
35+
return
3636
};
3737

3838
let Some((base_place, current)) = self.lower_expr_as_place(current, *base, true)? else {
39-
return Ok(None);
39+
return Ok(None)
4040
};
4141

4242
let Some(doc_attr) = variant
4343
.attrs
4444
.iter()
4545
.find(|attr| attr.path().is_ident("doc"))
4646
else {
47-
return Err(Error::new(variant.span(), r#"expected a doc comment"#));
47+
return Err(Error::new(variant.span(), r#"expected a doc comment"#))
4848
};
4949

5050
let Some((base_place, current)) = self.lower_expr_as_place(current, *base, true) else {
51-
return Ok(None);
51+
return Ok(None)
5252
};
5353

5454
let Stmt::Expr(
@@ -61,6 +61,6 @@ fn main() {
6161
return Err(Error::new(
6262
last_stmt.span(),
6363
"expected last expression to be `Some(match (..) { .. })`",
64-
));
64+
))
6565
};
6666
}

‎tests/target/configs/use_small_heuristics/default.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ fn format_let_else() {
3333
let Some(c) = opt else { return };
3434

3535
let Some(d) = some_very_very_very_very_long_name else {
36-
return;
36+
return
3737
};
3838
}

‎tests/target/configs/use_small_heuristics/off.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ fn format_let_else() {
2828
let Some(a) = opt else {};
2929

3030
let Some(b) = opt else {
31-
return;
31+
return
3232
};
3333

3434
let Some(c) = opt else {
35-
return;
35+
return
3636
};
3737

3838
let Some(d) = some_very_very_very_very_long_name else {
39-
return;
39+
return
4040
};
4141
}

‎tests/target/expr.rs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ fn bar() {
125125

126126
loop {
127127
if true {
128-
break;
128+
break
129129
}
130130
}
131131

@@ -536,18 +536,14 @@ fn issue3226() {
536536
{
537537
{
538538
{
539-
return Err(
540-
ErrorKind::ManagementInterfaceError("Server exited unexpectedly").into(),
541-
);
539+
return Err(ErrorKind::ManagementInterfaceError("Server exited unexpectedly").into())
542540
}
543541
}
544542
}
545543
{
546544
{
547545
{
548-
break Err(
549-
ErrorKind::ManagementInterfaceError("Server exited unexpectedlyy").into(),
550-
);
546+
break Err(ErrorKind::ManagementInterfaceError("Server exited unexpectedlyy").into())
551547
}
552548
}
553549
}

‎tests/target/issue-3213/version_two.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
fn foo() {
44
match 0 {
55
0 => {
6-
return AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA;
6+
return AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
77
}
88
1 => {
99
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

‎tests/target/let_else.rs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fn main() {
2121

2222
let Some(x) = opt else {
2323
let y = 1;
24-
return y;
24+
return y
2525
};
2626

2727
let Some(x) = y.foo(
@@ -54,41 +54,41 @@ fn with_comments_around_else_keyword() {
5454
let Some(x) = opt
5555
/* pre else keyword block-comment */
5656
else {
57-
return;
57+
return
5858
};
5959

6060
let Some(x) = opt else
6161
/* post else keyword block-comment */
6262
{
63-
return;
63+
return
6464
};
6565

6666
let Some(x) = opt
6767
/* pre else keyword block-comment */
6868
else
6969
/* post else keyword block-comment */
7070
{
71-
return;
71+
return
7272
};
7373

7474
let Some(x) = opt
7575
// pre else keyword line-comment
7676
else {
77-
return;
77+
return
7878
};
7979

8080
let Some(x) = opt else
8181
// post else keyword line-comment
8282
{
83-
return;
83+
return
8484
};
8585

8686
let Some(x) = opt
8787
// pre else keyword line-comment
8888
else
8989
// post else keyword line-comment
9090
{
91-
return;
91+
return
9292
};
9393
}
9494

@@ -106,7 +106,7 @@ fn unbreakable_initializer_expr_pre_formatting_let_else_length_near_max_width()
106106
// and the else block is formatted over multiple lines because we can't fit the
107107
// else block on the same line as the initializer expr.
108108
let Some(x) = some_really_really_really_really_really_really_really_long_name___B else {
109-
return;
109+
return
110110
};
111111

112112
// Pre Formatting:
@@ -126,7 +126,7 @@ fn unbreakable_initializer_expr_pre_formatting_let_else_length_near_max_width()
126126
// and the else block is formatted over multiple lines because we can't fit the
127127
// else block on the same line as the initializer expr.
128128
let Some(x) = some_really_really_really_really_really_really_really_long_name__D else {
129-
return;
129+
return
130130
};
131131
}
132132

@@ -138,7 +138,7 @@ fn unbreakable_initializer_expr_pre_formatting_length_up_to_opening_brace_near_m
138138
// and the else block is formatted over multiple lines because we can't fit the
139139
// else block on the same line as the initializer expr.
140140
let Some(x) = some_really_really_really_really_really_really_really_really_long_name___E else {
141-
return;
141+
return
142142
};
143143

144144
// Pre Formatting:
@@ -148,7 +148,7 @@ fn unbreakable_initializer_expr_pre_formatting_length_up_to_opening_brace_near_m
148148
// They are formatted on the next line.
149149
let Some(x) = some_really_really_really_really_really_really_really_really_long_name_____F
150150
else {
151-
return;
151+
return
152152
};
153153
}
154154

@@ -160,7 +160,7 @@ fn unbreakable_initializer_expr_pre_formatting_length_through_initializer_expr_n
160160
// They are formatted on the next line.
161161
let Some(x) = some_really_really_really_really_really_really_really_really_really_long_name___G
162162
else {
163-
return;
163+
return
164164
};
165165

166166
// Pre Formatting:
@@ -171,7 +171,7 @@ fn unbreakable_initializer_expr_pre_formatting_length_through_initializer_expr_n
171171
let Some(x) =
172172
some_really_really_really_really_really_really_really_really_really_long_name____H
173173
else {
174-
return;
174+
return
175175
};
176176

177177
// Pre Formatting:
@@ -186,7 +186,7 @@ fn unbreakable_initializer_expr_pre_formatting_length_through_initializer_expr_n
186186
let Some(x) =
187187
some_really_really_really_really_really_really_really_really_really_really_long_name______I
188188
else {
189-
return;
189+
return
190190
};
191191

192192
// Pre Formatting:
@@ -240,7 +240,7 @@ fn with_trailing_try_operator() {
240240
&ranking_rule_universes[cur_ranking_rule_index],
241241
)?
242242
else {
243-
return;
243+
return
244244
};
245245

246246
// Maybe this is a workaround?
@@ -249,7 +249,7 @@ fn with_trailing_try_operator() {
249249
logger,
250250
&ranking_rule_universes[cur_ranking_rule_index],
251251
) else {
252-
return;
252+
return
253253
};
254254
}
255255

0 commit comments

Comments
 (0)