Skip to content

Commit 2817be9

Browse files
committed
Update rustfix for compiletest.
1 parent e82b650 commit 2817be9

File tree

5 files changed

+13
-11
lines changed

5 files changed

+13
-11
lines changed

Cargo.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ dependencies = [
672672
"libc",
673673
"miow 0.3.6",
674674
"regex",
675-
"rustfix 0.5.1",
675+
"rustfix 0.6.0",
676676
"serde",
677677
"serde_json",
678678
"tracing",

src/test/ui/parser/expr-as-stmt.fixed

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// run-rustfix
2+
// rustfix-only-machine-applicable
23
#![allow(unused_variables)]
34
#![allow(dead_code)]
45
#![allow(unused_must_use)]

src/test/ui/parser/expr-as-stmt.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// run-rustfix
2+
// rustfix-only-machine-applicable
23
#![allow(unused_variables)]
34
#![allow(dead_code)]
45
#![allow(unused_must_use)]

src/test/ui/parser/expr-as-stmt.stderr

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
error: expected expression, found `+`
2-
--> $DIR/expr-as-stmt.rs:7:9
2+
--> $DIR/expr-as-stmt.rs:8:9
33
|
44
LL | {2} + {2}
55
| --- ^ expected expression
66
| |
77
| help: parentheses are required to parse this as an expression: `({2})`
88

99
error: expected expression, found `+`
10-
--> $DIR/expr-as-stmt.rs:12:9
10+
--> $DIR/expr-as-stmt.rs:13:9
1111
|
1212
LL | {2} + 2
1313
| --- ^ expected expression
1414
| |
1515
| help: parentheses are required to parse this as an expression: `({2})`
1616

1717
error: expected expression, found `+`
18-
--> $DIR/expr-as-stmt.rs:18:12
18+
--> $DIR/expr-as-stmt.rs:19:12
1919
|
2020
LL | { 42 } + foo;
2121
| ------ ^ expected expression
2222
| |
2323
| help: parentheses are required to parse this as an expression: `({ 42 })`
2424

2525
error: expected expression, found `>`
26-
--> $DIR/expr-as-stmt.rs:31:7
26+
--> $DIR/expr-as-stmt.rs:32:7
2727
|
2828
LL | } > 0
2929
| ^ expected expression
@@ -36,7 +36,7 @@ LL | }) > 0
3636
|
3737

3838
error[E0308]: mismatched types
39-
--> $DIR/expr-as-stmt.rs:7:6
39+
--> $DIR/expr-as-stmt.rs:8:6
4040
|
4141
LL | {2} + {2}
4242
| ^ expected `()`, found integer
@@ -47,7 +47,7 @@ LL | {return 2;} + {2}
4747
| ^^^^^^ ^
4848

4949
error[E0308]: mismatched types
50-
--> $DIR/expr-as-stmt.rs:12:6
50+
--> $DIR/expr-as-stmt.rs:13:6
5151
|
5252
LL | {2} + 2
5353
| ^ expected `()`, found integer
@@ -58,7 +58,7 @@ LL | {return 2;} + 2
5858
| ^^^^^^ ^
5959

6060
error[E0308]: mismatched types
61-
--> $DIR/expr-as-stmt.rs:18:7
61+
--> $DIR/expr-as-stmt.rs:19:7
6262
|
6363
LL | { 42 } + foo;
6464
| ^^ expected `()`, found integer
@@ -69,7 +69,7 @@ LL | { return 42; } + foo;
6969
| ^^^^^^ ^
7070

7171
error[E0308]: mismatched types
72-
--> $DIR/expr-as-stmt.rs:24:7
72+
--> $DIR/expr-as-stmt.rs:25:7
7373
|
7474
LL | { 3 } * 3
7575
| ^ expected `()`, found integer
@@ -80,7 +80,7 @@ LL | { return 3; } * 3
8080
| ^^^^^^ ^
8181

8282
error[E0614]: type `{integer}` cannot be dereferenced
83-
--> $DIR/expr-as-stmt.rs:24:11
83+
--> $DIR/expr-as-stmt.rs:25:11
8484
|
8585
LL | { 3 } * 3
8686
| ----- ^^^

src/tools/compiletest/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ tracing-subscriber = { version = "0.2", default-features = false, features = ["f
1414
regex = "1.0"
1515
serde = { version = "1.0", features = ["derive"] }
1616
serde_json = "1.0"
17-
rustfix = "0.5.0"
17+
rustfix = "0.6.0"
1818
lazy_static = "1.0"
1919
walkdir = "2"
2020
glob = "0.3.0"

0 commit comments

Comments
 (0)