Skip to content

Commit 5d5bad6

Browse files
hvitvedhvitved
committed
Rust: Update expected test output
1 parent 5fb425f commit 5d5bad6

File tree

7 files changed

+2451
-1888
lines changed

7 files changed

+2451
-1888
lines changed

‎rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ getTokenTree
1010
| gen_macro_call.rs:7:5:7:29 | println!... | gen_macro_call.rs:7:13:7:29 | TokenTree |
1111
| gen_macro_call.rs:7:14:7:28 | ...::format_args_nl!... | gen_macro_call.rs:7:14:7:28 | TokenTree |
1212
getMacroCallExpansion
13-
| gen_macro_call.rs:7:5:7:29 | println!... | gen_macro_call.rs:7:14:7:28 | MacroBlockExpr |
13+
| gen_macro_call.rs:7:5:7:29 | println!... | gen_macro_call.rs:7:14:7:28 | { ... } |
1414
| gen_macro_call.rs:7:14:7:28 | ...::format_args_nl!... | gen_macro_call.rs:7:14:7:28 | FormatArgsExpr |

‎rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected‎

Lines changed: 1955 additions & 1844 deletions
Large diffs are not rendered by default.

‎rust/ql/test/extractor-tests/macro-expansion/test.expected‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ macro_calls
2626
| macro_expansion.rs:31:5:31:16 | ...::format_args_nl!... | macro_expansion.rs:31:5:31:16 | FormatArgsExpr |
2727
| macro_expansion.rs:31:5:31:16 | ...::format_args_nl!... | macro_expansion.rs:31:5:31:16 | FormatArgsExpr |
2828
| macro_expansion.rs:31:5:31:16 | ...::format_args_nl!... | macro_expansion.rs:31:5:31:16 | FormatArgsExpr |
29-
| macro_expansion.rs:31:5:31:16 | println!... | macro_expansion.rs:31:5:31:16 | MacroBlockExpr |
30-
| macro_expansion.rs:31:5:31:16 | println!... | macro_expansion.rs:31:5:31:16 | MacroBlockExpr |
31-
| macro_expansion.rs:31:5:31:16 | println!... | macro_expansion.rs:31:5:31:16 | MacroBlockExpr |
32-
| macro_expansion.rs:33:9:33:16 | hello!... | macro_expansion.rs:31:5:31:16 | MacroBlockExpr |
33-
| macro_expansion.rs:33:9:33:16 | hello!... | macro_expansion.rs:31:5:31:16 | MacroBlockExpr |
34-
| macro_expansion.rs:33:9:33:16 | hello!... | macro_expansion.rs:31:5:31:16 | MacroBlockExpr |
29+
| macro_expansion.rs:31:5:31:16 | println!... | macro_expansion.rs:31:5:31:16 | { ... } |
30+
| macro_expansion.rs:31:5:31:16 | println!... | macro_expansion.rs:31:5:31:16 | { ... } |
31+
| macro_expansion.rs:31:5:31:16 | println!... | macro_expansion.rs:31:5:31:16 | { ... } |
32+
| macro_expansion.rs:33:9:33:16 | hello!... | macro_expansion.rs:31:5:31:16 | { ... } |
33+
| macro_expansion.rs:33:9:33:16 | hello!... | macro_expansion.rs:31:5:31:16 | { ... } |
34+
| macro_expansion.rs:33:9:33:16 | hello!... | macro_expansion.rs:31:5:31:16 | { ... } |
3535
| macro_expansion.rs:44:5:44:13 | def_x!... | macro_expansion.rs:44:5:44:10 | MacroItems |
3636
| macro_expansion.rs:53:9:53:25 | concat!... | macro_expansion.rs:53:17:53:24 | "xy" |
3737
| macro_expansion.rs:55:9:58:5 | my_macro!... | macro_expansion.rs:56:9:57:13 | MacroExpr |

‎rust/ql/test/library-tests/controlflow/Cfg.expected‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -400,9 +400,9 @@ edges
400400
| test.rs:171:26:171:28 | ...::format_args_nl!... | test.rs:171:26:171:28 | MacroExpr | |
401401
| test.rs:171:26:171:28 | ExprStmt | test.rs:171:17:171:24 | ...::_print | |
402402
| test.rs:171:26:171:28 | FormatArgsExpr | test.rs:171:26:171:28 | ...::format_args_nl!... | |
403-
| test.rs:171:26:171:28 | MacroBlockExpr | test.rs:171:17:171:29 | println!... | |
404403
| test.rs:171:26:171:28 | MacroExpr | test.rs:171:26:171:28 | ...::_print(...) | |
405-
| test.rs:171:26:171:28 | { ... } | test.rs:171:26:171:28 | MacroBlockExpr | |
404+
| test.rs:171:26:171:28 | { ... } | test.rs:171:17:171:29 | println!... | |
405+
| test.rs:171:26:171:28 | { ... } | test.rs:171:26:171:28 | { ... } | |
406406
| test.rs:172:20:174:13 | { ... } | test.rs:170:13:174:13 | if cond2 {...} else {...} | |
407407
| test.rs:173:17:173:24 | ...::_print | test.rs:173:26:173:28 | "2\\n" | |
408408
| test.rs:173:17:173:29 | MacroExpr | test.rs:172:20:174:13 | { ... } | |
@@ -413,9 +413,9 @@ edges
413413
| test.rs:173:26:173:28 | ...::format_args_nl!... | test.rs:173:26:173:28 | MacroExpr | |
414414
| test.rs:173:26:173:28 | ExprStmt | test.rs:173:17:173:24 | ...::_print | |
415415
| test.rs:173:26:173:28 | FormatArgsExpr | test.rs:173:26:173:28 | ...::format_args_nl!... | |
416-
| test.rs:173:26:173:28 | MacroBlockExpr | test.rs:173:17:173:29 | println!... | |
417416
| test.rs:173:26:173:28 | MacroExpr | test.rs:173:26:173:28 | ...::_print(...) | |
418-
| test.rs:173:26:173:28 | { ... } | test.rs:173:26:173:28 | MacroBlockExpr | |
417+
| test.rs:173:26:173:28 | { ... } | test.rs:173:17:173:29 | println!... | |
418+
| test.rs:173:26:173:28 | { ... } | test.rs:173:26:173:28 | { ... } | |
419419
| test.rs:175:13:175:20 | ...::_print | test.rs:175:22:175:24 | "3\\n" | |
420420
| test.rs:175:13:175:25 | MacroExpr | test.rs:169:18:176:9 | { ... } | |
421421
| test.rs:175:13:175:25 | println!... | test.rs:175:13:175:25 | MacroExpr | |
@@ -425,9 +425,9 @@ edges
425425
| test.rs:175:22:175:24 | ...::format_args_nl!... | test.rs:175:22:175:24 | MacroExpr | |
426426
| test.rs:175:22:175:24 | ExprStmt | test.rs:175:13:175:20 | ...::_print | |
427427
| test.rs:175:22:175:24 | FormatArgsExpr | test.rs:175:22:175:24 | ...::format_args_nl!... | |
428-
| test.rs:175:22:175:24 | MacroBlockExpr | test.rs:175:13:175:25 | println!... | |
429428
| test.rs:175:22:175:24 | MacroExpr | test.rs:175:22:175:24 | ...::_print(...) | |
430-
| test.rs:175:22:175:24 | { ... } | test.rs:175:22:175:24 | MacroBlockExpr | |
429+
| test.rs:175:22:175:24 | { ... } | test.rs:175:13:175:25 | println!... | |
430+
| test.rs:175:22:175:24 | { ... } | test.rs:175:22:175:24 | { ... } | |
431431
| test.rs:179:5:188:5 | enter fn test_nested_if_match | test.rs:179:29:179:29 | a | |
432432
| test.rs:179:5:188:5 | exit fn test_nested_if_match (normal) | test.rs:179:5:188:5 | exit fn test_nested_if_match | |
433433
| test.rs:179:29:179:29 | a | test.rs:179:29:179:29 | a | |
@@ -905,11 +905,11 @@ edges
905905
| test.rs:363:39:363:53 | ...::panic_fmt(...) | test.rs:363:39:363:53 | { ... } | |
906906
| test.rs:363:39:363:53 | ExprStmt | test.rs:363:32:363:37 | ...::panic_fmt | |
907907
| test.rs:363:39:363:53 | FormatArgsExpr | test.rs:363:39:363:53 | ...::const_format_args!... | |
908-
| test.rs:363:39:363:53 | MacroBlockExpr | test.rs:363:32:363:54 | panic!... | |
909-
| test.rs:363:39:363:53 | MacroBlockExpr | test.rs:363:39:363:53 | ...::panic_2021!... | |
910908
| test.rs:363:39:363:53 | MacroExpr | test.rs:363:39:363:53 | ...::panic_fmt(...) | |
911-
| test.rs:363:39:363:53 | MacroExpr | test.rs:363:39:363:53 | MacroBlockExpr | |
912-
| test.rs:363:39:363:53 | { ... } | test.rs:363:39:363:53 | MacroBlockExpr | |
909+
| test.rs:363:39:363:53 | MacroExpr | test.rs:363:39:363:53 | { ... } | |
910+
| test.rs:363:39:363:53 | { ... } | test.rs:363:32:363:54 | panic!... | |
911+
| test.rs:363:39:363:53 | { ... } | test.rs:363:39:363:53 | ...::panic_2021!... | |
912+
| test.rs:363:39:363:53 | { ... } | test.rs:363:39:363:53 | { ... } | |
913913
| test.rs:364:9:364:9 | n | test.rs:362:46:365:5 | { ... } | |
914914
| test.rs:367:5:373:5 | enter fn test_let_with_return | test.rs:367:29:367:29 | m | |
915915
| test.rs:367:5:373:5 | exit fn test_let_with_return (normal) | test.rs:367:5:373:5 | exit fn test_let_with_return | |
@@ -1190,9 +1190,9 @@ edges
11901190
| test.rs:495:18:495:32 | ...::format_args_nl!... | test.rs:495:18:495:32 | MacroExpr | |
11911191
| test.rs:495:18:495:32 | ExprStmt | test.rs:495:9:495:16 | ...::_print | |
11921192
| test.rs:495:18:495:32 | FormatArgsExpr | test.rs:495:18:495:32 | ...::format_args_nl!... | |
1193-
| test.rs:495:18:495:32 | MacroBlockExpr | test.rs:495:9:495:33 | println!... | |
11941193
| test.rs:495:18:495:32 | MacroExpr | test.rs:495:18:495:32 | ...::_print(...) | |
1195-
| test.rs:495:18:495:32 | { ... } | test.rs:495:18:495:32 | MacroBlockExpr | |
1194+
| test.rs:495:18:495:32 | { ... } | test.rs:495:9:495:33 | println!... | |
1195+
| test.rs:495:18:495:32 | { ... } | test.rs:495:18:495:32 | { ... } | |
11961196
| test.rs:498:5:517:5 | enter fn async_block | test.rs:498:26:498:26 | b | |
11971197
| test.rs:498:5:517:5 | exit fn async_block (normal) | test.rs:498:5:517:5 | exit fn async_block | |
11981198
| test.rs:498:26:498:26 | b | test.rs:498:26:498:26 | b | |
@@ -1214,9 +1214,9 @@ edges
12141214
| test.rs:500:22:500:40 | ...::format_args_nl!... | test.rs:500:22:500:40 | MacroExpr | |
12151215
| test.rs:500:22:500:40 | ExprStmt | test.rs:500:13:500:20 | ...::_print | |
12161216
| test.rs:500:22:500:40 | FormatArgsExpr | test.rs:500:22:500:40 | ...::format_args_nl!... | |
1217-
| test.rs:500:22:500:40 | MacroBlockExpr | test.rs:500:13:500:41 | println!... | |
12181217
| test.rs:500:22:500:40 | MacroExpr | test.rs:500:22:500:40 | ...::_print(...) | |
1219-
| test.rs:500:22:500:40 | { ... } | test.rs:500:22:500:40 | MacroBlockExpr | |
1218+
| test.rs:500:22:500:40 | { ... } | test.rs:500:13:500:41 | println!... | |
1219+
| test.rs:500:22:500:40 | { ... } | test.rs:500:22:500:40 | { ... } | |
12201220
| test.rs:502:9:504:10 | let ... = ... | test.rs:502:31:504:9 | { ... } | |
12211221
| test.rs:502:13:502:27 | say_how_are_you | test.rs:502:13:502:27 | say_how_are_you | |
12221222
| test.rs:502:13:502:27 | say_how_are_you | test.rs:505:9:505:28 | let ... = ... | match |
@@ -1232,9 +1232,9 @@ edges
12321232
| test.rs:503:22:503:35 | ...::format_args_nl!... | test.rs:503:22:503:35 | MacroExpr | |
12331233
| test.rs:503:22:503:35 | ExprStmt | test.rs:503:13:503:20 | ...::_print | |
12341234
| test.rs:503:22:503:35 | FormatArgsExpr | test.rs:503:22:503:35 | ...::format_args_nl!... | |
1235-
| test.rs:503:22:503:35 | MacroBlockExpr | test.rs:503:13:503:36 | println!... | |
12361235
| test.rs:503:22:503:35 | MacroExpr | test.rs:503:22:503:35 | ...::_print(...) | |
1237-
| test.rs:503:22:503:35 | { ... } | test.rs:503:22:503:35 | MacroBlockExpr | |
1236+
| test.rs:503:22:503:35 | { ... } | test.rs:503:13:503:36 | println!... | |
1237+
| test.rs:503:22:503:35 | { ... } | test.rs:503:22:503:35 | { ... } | |
12381238
| test.rs:505:9:505:28 | let ... = ... | test.rs:505:20:505:27 | { ... } | |
12391239
| test.rs:505:13:505:16 | noop | test.rs:505:13:505:16 | noop | |
12401240
| test.rs:505:13:505:16 | noop | test.rs:506:9:506:26 | ExprStmt | match |
@@ -1293,15 +1293,15 @@ edges
12931293
| test.rs:533:13:533:19 | ...::panic_explicit(...) | test.rs:533:13:533:19 | { ... } | |
12941294
| test.rs:533:13:533:19 | ExprStmt | test.rs:533:13:533:19 | fn panic_cold_explicit | |
12951295
| test.rs:533:13:533:19 | ExprStmt | test.rs:533:13:533:19 | panic_cold_explicit | |
1296-
| test.rs:533:13:533:19 | MacroBlockExpr | test.rs:533:13:533:19 | ...::panic_2021!... | |
12971296
| test.rs:533:13:533:19 | MacroExpr | test.rs:533:13:533:19 | { ... } | |
12981297
| test.rs:533:13:533:19 | enter fn panic_cold_explicit | test.rs:533:13:533:19 | ...::panic_explicit | |
12991298
| test.rs:533:13:533:19 | exit fn panic_cold_explicit (normal) | test.rs:533:13:533:19 | exit fn panic_cold_explicit | |
13001299
| test.rs:533:13:533:19 | fn panic_cold_explicit | test.rs:533:13:533:19 | ExprStmt | |
13011300
| test.rs:533:13:533:19 | panic_cold_explicit | test.rs:533:13:533:19 | panic_cold_explicit(...) | |
13021301
| test.rs:533:13:533:19 | panic_cold_explicit(...) | test.rs:533:13:533:19 | { ... } | |
1303-
| test.rs:533:13:533:19 | { ... } | test.rs:533:13:533:19 | MacroBlockExpr | |
1302+
| test.rs:533:13:533:19 | { ... } | test.rs:533:13:533:19 | ...::panic_2021!... | |
13041303
| test.rs:533:13:533:19 | { ... } | test.rs:533:13:533:19 | exit fn panic_cold_explicit (normal) | |
1304+
| test.rs:533:13:533:19 | { ... } | test.rs:533:13:533:19 | { ... } | |
13051305
| test.rs:533:13:533:19 | { ... } | test.rs:533:21:533:48 | if ... {...} | |
13061306
| test.rs:533:13:533:49 | MacroExpr | test.rs:532:9:534:9 | { ... } | |
13071307
| test.rs:533:13:533:49 | assert!... | test.rs:533:13:533:49 | MacroExpr | |
@@ -1310,11 +1310,11 @@ edges
13101310
| test.rs:533:21:533:44 | ...::size_of::<...>(...) | test.rs:533:48:533:48 | 0 | |
13111311
| test.rs:533:21:533:48 | ... > ... | test.rs:533:21:533:48 | [boolean(false)] ! ... | true |
13121312
| test.rs:533:21:533:48 | ... > ... | test.rs:533:21:533:48 | [boolean(true)] ! ... | false |
1313-
| test.rs:533:21:533:48 | MacroBlockExpr | test.rs:533:13:533:49 | assert!... | |
13141313
| test.rs:533:21:533:48 | [boolean(false)] ! ... | test.rs:533:21:533:48 | if ... {...} | false |
13151314
| test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:13:533:19 | ExprStmt | true |
13161315
| test.rs:533:21:533:48 | if ... {...} | test.rs:533:21:533:48 | { ... } | |
1317-
| test.rs:533:21:533:48 | { ... } | test.rs:533:21:533:48 | MacroBlockExpr | |
1316+
| test.rs:533:21:533:48 | { ... } | test.rs:533:13:533:49 | assert!... | |
1317+
| test.rs:533:21:533:48 | { ... } | test.rs:533:21:533:48 | { ... } | |
13181318
| test.rs:533:48:533:48 | 0 | test.rs:533:21:533:48 | ... > ... | |
13191319
| test.rs:536:9:536:10 | 42 | test.rs:529:41:537:5 | { ... } | |
13201320
| test.rs:539:5:548:5 | enter fn const_block_panic | test.rs:540:9:540:30 | Const | |

‎rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ localStep
1111
| main.rs:7:9:7:9 | s | main.rs:7:9:7:9 | s |
1212
| main.rs:7:9:7:14 | ...: i64 | main.rs:7:9:7:9 | s |
1313
| main.rs:8:14:8:20 | FormatArgsExpr | main.rs:8:14:8:20 | MacroExpr |
14-
| main.rs:8:14:8:20 | MacroBlockExpr | main.rs:8:5:8:21 | MacroExpr |
1514
| main.rs:8:14:8:20 | [post] MacroExpr | main.rs:8:14:8:20 | [post] FormatArgsExpr |
16-
| main.rs:8:14:8:20 | { ... } | main.rs:8:14:8:20 | MacroBlockExpr |
15+
| main.rs:8:14:8:20 | { ... } | main.rs:8:5:8:21 | MacroExpr |
16+
| main.rs:8:14:8:20 | { ... } | main.rs:8:14:8:20 | { ... } |
1717
| main.rs:11:13:11:14 | [SSA] sr | main.rs:12:20:12:21 | sr |
1818
| main.rs:11:13:11:14 | sr | main.rs:11:13:11:14 | [SSA] sr |
1919
| main.rs:11:13:11:14 | sr | main.rs:11:13:11:14 | sr |
2020
| main.rs:11:13:11:20 | ...: ... | main.rs:11:13:11:14 | sr |
2121
| main.rs:12:14:12:21 | FormatArgsExpr | main.rs:12:14:12:21 | MacroExpr |
22-
| main.rs:12:14:12:21 | MacroBlockExpr | main.rs:12:5:12:22 | MacroExpr |
2322
| main.rs:12:14:12:21 | [post] MacroExpr | main.rs:12:14:12:21 | [post] FormatArgsExpr |
24-
| main.rs:12:14:12:21 | { ... } | main.rs:12:14:12:21 | MacroBlockExpr |
23+
| main.rs:12:14:12:21 | { ... } | main.rs:12:5:12:22 | MacroExpr |
24+
| main.rs:12:14:12:21 | { ... } | main.rs:12:14:12:21 | { ... } |
2525
| main.rs:23:9:23:9 | [SSA] s | main.rs:24:10:24:10 | s |
2626
| main.rs:23:9:23:9 | s | main.rs:23:9:23:9 | [SSA] s |
2727
| main.rs:23:9:23:9 | s | main.rs:23:9:23:9 | s |
@@ -697,9 +697,9 @@ localStep
697697
| main.rs:500:16:500:16 | s | main.rs:500:16:500:16 | s |
698698
| main.rs:500:16:500:24 | ...: String | main.rs:500:16:500:16 | s |
699699
| main.rs:501:14:501:20 | FormatArgsExpr | main.rs:501:14:501:20 | MacroExpr |
700-
| main.rs:501:14:501:20 | MacroBlockExpr | main.rs:501:5:501:21 | MacroExpr |
701700
| main.rs:501:14:501:20 | [post] MacroExpr | main.rs:501:14:501:20 | [post] FormatArgsExpr |
702-
| main.rs:501:14:501:20 | { ... } | main.rs:501:14:501:20 | MacroBlockExpr |
701+
| main.rs:501:14:501:20 | { ... } | main.rs:501:5:501:21 | MacroExpr |
702+
| main.rs:501:14:501:20 | { ... } | main.rs:501:14:501:20 | { ... } |
703703
| main.rs:505:9:505:9 | [SSA] a | main.rs:506:13:506:13 | a |
704704
| main.rs:505:9:505:9 | a | main.rs:505:9:505:9 | [SSA] a |
705705
| main.rs:505:9:505:9 | a | main.rs:505:9:505:9 | a |

0 commit comments

Comments
 (0)