Skip to content

Commit 9470a2b

Browse files
committed
Rust: accept fixes in integration test
1 parent 66f88d3 commit 9470a2b

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

rust/ql/integration-tests/macro-expansion/calls/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ macro_rules! def_x {
77
}
88

99
impl S {
10-
def_x!(); // this didn't expand in 0.0.274-0.0.281
10+
def_x!(); // this didn't expand in 0.0.274..0.0.285
1111
}
1212

1313
macro_rules! my_macro {
@@ -33,14 +33,14 @@ macro_rules! my_int {
3333
() => { i32 };
3434
}
3535

36-
fn answer() -> my_int!() { // this doesn't expand since 0.0.274
36+
fn answer() -> my_int!() { // this didn't expand in 0.0.274..0.0.287
3737
let a: my_int!() = 42; // this is fine
3838
a as my_int!() // this is fine too
3939
}
4040

4141

42-
type MyInt = my_int!(); // this doesn't expand since 0.0.274
42+
type MyInt = my_int!(); // this didn't expand in 0.0.274..0.0.287
4343

4444
struct MyStruct {
45-
field: my_int!(), // this doesn't expand since 0.0.274
45+
field: my_int!(), // this didn't expand in 0.0.274..0.0.287
4646
}

rust/ql/integration-tests/macro-expansion/test.expected

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,13 @@ macro_calls
2727
| calls/src/lib.rs:22:9:23:13 | format!... | calls/src/lib.rs:22:9:23:13 | ...::must_use(...) |
2828
| calls/src/lib.rs:27:1:27:24 | concat!... | calls/src/lib.rs:27:1:27:24 | "Hello world!" |
2929
| calls/src/lib.rs:27:1:27:24 | include!... | calls/src/lib.rs:27:1:27:24 | MacroItems |
30+
| calls/src/lib.rs:36:16:36:24 | my_int!... | calls/src/lib.rs:36:16:36:24 | i32 |
3031
| calls/src/lib.rs:37:12:37:20 | my_int!... | calls/src/lib.rs:37:12:37:20 | i32 |
31-
| calls/src/lib.rs:38:12:38:20 | my_int!... | calls/src/lib.rs:38:12:38:20 | i32 |
32-
| calls/src/lib.rs:39:10:39:18 | my_int!... | calls/src/lib.rs:39:10:39:18 | i32 |
32+
| calls/src/lib.rs:38:10:38:18 | my_int!... | calls/src/lib.rs:38:10:38:18 | i32 |
33+
| calls/src/lib.rs:42:14:42:22 | my_int!... | calls/src/lib.rs:42:14:42:22 | i32 |
34+
| calls/src/lib.rs:45:12:45:20 | my_int!... | calls/src/lib.rs:45:12:45:20 | i32 |
3335
unexpanded_macro_calls
3436
| attributes/src/lib.rs:5:9:5:35 | concat!... |
3537
| calls/src/included.rs:2:9:2:39 | concat!... |
3638
| calls/src/lib.rs:22:9:22:31 | concat!... |
3739
| calls/src/lib.rs:29:9:29:32 | include_str!... |
38-
| calls/src/lib.rs:36:16:36:24 | my_int!... |
39-
| calls/src/lib.rs:43:14:43:22 | my_int!... |
40-
| calls/src/lib.rs:46:12:46:20 | my_int!... |

0 commit comments

Comments
 (0)