Skip to content

Commit 5c64a8c

Browse files
paldepindpaldepind
committed
Rust: Accept expected changes and fix other CI complaints
1 parent cd957ba commit 5c64a8c

17 files changed

+202
-19
lines changed

‎rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll

+11
Original file line numberDiff line numberDiff line change
@@ -186,10 +186,14 @@ final class CallExprCfgNode extends CallExprBaseCfgNode, Nodes::CallExprCfgNode
186186
final class FormatArgsExprCfgNode extends Nodes::FormatArgsExprCfgNode {
187187
private FormatArgsExprChildMapping node;
188188

189+
FormatArgsExprCfgNode() { node = this.getAstNode() }
190+
191+
/** Gets the `i`th argument of this format arguments expression (0-based). */
189192
ExprCfgNode getArgumentExpr(int i) {
190193
any(ChildMapping mapping).hasCfgChild(node, node.getArg(i).getExpr(), this, result)
191194
}
192195

196+
/** Gets a format argument of the `i`th format of this format arguments expression (0-based). */
193197
FormatTemplateVariableAccessCfgNode getFormatTemplateVariableAccess(int i) {
194198
exists(FormatTemplateVariableAccess v |
195199
v.getArgument() = node.getFormat(i).getArgument() and
@@ -199,11 +203,18 @@ final class FormatArgsExprCfgNode extends Nodes::FormatArgsExprCfgNode {
199203
}
200204
}
201205

206+
/**
207+
* A MacroCall. For example:
208+
* ```rust
209+
* todo!()
210+
* ```
211+
*/
202212
final class MacroCallCfgNode extends Nodes::MacroCallCfgNode {
203213
private MacroCallChildMapping node;
204214

205215
MacroCallCfgNode() { node = this.getAstNode() }
206216

217+
/** Gets the CFG node for the expansion of this macro call, if it exists. */
207218
CfgNode getExpandedNode() {
208219
any(ChildMapping mapping).hasCfgChild(node, node.getExpanded(), this, result)
209220
}

‎rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format.expected

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
| gen_format.rs:5:21:5:22 | {} | getParent: | gen_format.rs:5:14:5:32 | FormatArgsExpr | getIndex: | 1 | hasArgument: | no |
2+
| gen_format.rs:7:21:7:46 | {value:#width$.precision$} | getParent: | gen_format.rs:7:14:7:47 | FormatArgsExpr | getIndex: | 1 | hasArgument: | yes |
3+
| gen_format_args_arg.rs:5:26:5:27 | {} | getParent: | gen_format_args_arg.rs:5:17:5:39 | FormatArgsExpr | getIndex: | 1 | hasArgument: | no |
24
| gen_format_args_expr.rs:6:19:6:20 | {} | getParent: | gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | getIndex: | 1 | hasArgument: | no |
35
| gen_format_args_expr.rs:6:26:6:29 | {:?} | getParent: | gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | getIndex: | 3 | hasArgument: | no |
46
| gen_format_args_expr.rs:7:19:7:21 | {b} | getParent: | gen_format_args_expr.rs:7:17:7:43 | FormatArgsExpr | getIndex: | 1 | hasArgument: | yes |

‎rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.expected

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
| gen_format.rs:5:26:5:32 | FormatArgsArg | hasExpr: | yes | hasName: | no |
2+
| gen_format_args_arg.rs:5:32:5:38 | FormatArgsArg | hasExpr: | yes | hasName: | no |
23
| gen_format_args_expr.rs:6:33:6:33 | FormatArgsArg | hasExpr: | yes | hasName: | no |
34
| gen_format_args_expr.rs:6:36:6:36 | FormatArgsArg | hasExpr: | yes | hasName: | no |
45
| gen_format_args_expr.rs:7:35:7:37 | FormatArgsArg | hasExpr: | yes | hasName: | yes |

‎rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg_getExpr.expected

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
| gen_format.rs:5:26:5:32 | FormatArgsArg | gen_format.rs:5:26:5:32 | "world" |
2+
| gen_format_args_arg.rs:5:32:5:38 | FormatArgsArg | gen_format_args_arg.rs:5:32:5:38 | "world" |
23
| gen_format_args_expr.rs:6:33:6:33 | FormatArgsArg | gen_format_args_expr.rs:6:33:6:33 | 1 |
34
| gen_format_args_expr.rs:6:36:6:36 | FormatArgsArg | gen_format_args_expr.rs:6:36:6:36 | 2 |
45
| gen_format_args_expr.rs:7:35:7:37 | FormatArgsArg | gen_format_args_expr.rs:7:37:7:37 | 1 |

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

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
| gen_format.rs:5:14:5:32 | FormatArgsExpr | getNumberOfArgs: | 1 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 1 |
2+
| gen_format.rs:7:14:7:47 | FormatArgsExpr | getNumberOfArgs: | 0 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 1 |
3+
| gen_format_args_arg.rs:5:17:5:39 | FormatArgsExpr | getNumberOfArgs: | 1 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 1 |
24
| gen_format_args_expr.rs:5:17:5:27 | FormatArgsExpr | getNumberOfArgs: | 0 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 0 |
35
| gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | getNumberOfArgs: | 2 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 2 |
46
| gen_format_args_expr.rs:7:17:7:43 | FormatArgsExpr | getNumberOfArgs: | 2 | getNumberOfAttrs: | 0 | hasTemplate: | yes | getNumberOfFormats: | 2 |

‎rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getArg.expected

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
| gen_format.rs:5:14:5:32 | FormatArgsExpr | 0 | gen_format.rs:5:26:5:32 | FormatArgsArg |
2+
| gen_format_args_arg.rs:5:17:5:39 | FormatArgsExpr | 0 | gen_format_args_arg.rs:5:32:5:38 | FormatArgsArg |
23
| gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | 0 | gen_format_args_expr.rs:6:33:6:33 | FormatArgsArg |
34
| gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | 1 | gen_format_args_expr.rs:6:36:6:36 | FormatArgsArg |
45
| gen_format_args_expr.rs:7:17:7:43 | FormatArgsExpr | 0 | gen_format_args_expr.rs:7:35:7:37 | FormatArgsArg |

‎rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getFormat.expected

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
| gen_format.rs:5:14:5:32 | FormatArgsExpr | 0 | gen_format.rs:5:21:5:22 | {} |
2+
| gen_format.rs:7:14:7:47 | FormatArgsExpr | 0 | gen_format.rs:7:21:7:46 | {value:#width$.precision$} |
3+
| gen_format_args_arg.rs:5:17:5:39 | FormatArgsExpr | 0 | gen_format_args_arg.rs:5:26:5:27 | {} |
24
| gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | 0 | gen_format_args_expr.rs:6:19:6:20 | {} |
35
| gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | 1 | gen_format_args_expr.rs:6:26:6:29 | {:?} |
46
| gen_format_args_expr.rs:7:17:7:43 | FormatArgsExpr | 0 | gen_format_args_expr.rs:7:19:7:21 | {b} |

‎rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr_getTemplate.expected

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
| gen_format.rs:5:14:5:32 | FormatArgsExpr | gen_format.rs:5:14:5:23 | "Hello {}\\n" |
2+
| gen_format.rs:7:14:7:47 | FormatArgsExpr | gen_format.rs:7:14:7:47 | "Value {value:#width$.precisio... |
3+
| gen_format_args_arg.rs:5:17:5:39 | FormatArgsExpr | gen_format_args_arg.rs:5:18:5:29 | "Hello, {}!" |
24
| gen_format_args_expr.rs:5:17:5:27 | FormatArgsExpr | gen_format_args_expr.rs:5:18:5:26 | "no args" |
35
| gen_format_args_expr.rs:6:17:6:37 | FormatArgsExpr | gen_format_args_expr.rs:6:18:6:30 | "{} foo {:?}" |
46
| gen_format_args_expr.rs:7:17:7:43 | FormatArgsExpr | gen_format_args_expr.rs:7:18:7:32 | "{b} foo {a:?}" |

‎rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument.expected

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
| gen_format.rs:7:22:7:26 | value | getParent: | gen_format.rs:7:21:7:46 | {value:#width$.precision$} | hasVariable: | yes |
2+
| gen_format.rs:7:29:7:33 | width | getParent: | gen_format.rs:7:21:7:46 | {value:#width$.precision$} | hasVariable: | yes |
3+
| gen_format.rs:7:36:7:44 | precision | getParent: | gen_format.rs:7:21:7:46 | {value:#width$.precision$} | hasVariable: | yes |
14
| gen_format_args_expr.rs:7:20:7:20 | b | getParent: | gen_format_args_expr.rs:7:19:7:21 | {b} | hasVariable: | no |
25
| gen_format_args_expr.rs:7:28:7:28 | a | getParent: | gen_format_args_expr.rs:7:27:7:31 | {a:?} | hasVariable: | no |
36
| gen_format_args_expr.rs:9:20:9:20 | x | getParent: | gen_format_args_expr.rs:9:19:9:21 | {x} | hasVariable: | yes |

‎rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatArgument_getVariable.expected

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
| gen_format.rs:7:22:7:26 | value | gen_format.rs:7:22:7:26 | value |
2+
| gen_format.rs:7:29:7:33 | width | gen_format.rs:7:29:7:33 | width |
3+
| gen_format.rs:7:36:7:44 | precision | gen_format.rs:7:36:7:44 | precision |
14
| gen_format_args_expr.rs:9:20:9:20 | x | gen_format_args_expr.rs:9:20:9:20 | x |
25
| gen_format_args_expr.rs:9:25:9:25 | y | gen_format_args_expr.rs:9:25:9:25 | y |
36
| gen_format_argument.rs:5:22:5:26 | value | gen_format_argument.rs:5:22:5:26 | value |

‎rust/ql/test/extractor-tests/generated/FormatArgsExpr/FormatTemplateVariableAccess.expected

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
| gen_format.rs:7:22:7:26 | value |
2+
| gen_format.rs:7:29:7:33 | width |
3+
| gen_format.rs:7:36:7:44 | precision |
14
| gen_format_args_expr.rs:9:20:9:20 | x |
25
| gen_format_args_expr.rs:9:25:9:25 | y |
36
| gen_format_argument.rs:5:22:5:26 | value |

‎rust/ql/test/extractor-tests/generated/FormatArgsExpr/Format_getArgument.expected

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
| gen_format.rs:7:21:7:46 | {value:#width$.precision$} | gen_format.rs:7:22:7:26 | value |
2+
| gen_format.rs:7:21:7:46 | {value:#width$.precision$} | gen_format.rs:7:29:7:33 | width |
3+
| gen_format.rs:7:21:7:46 | {value:#width$.precision$} | gen_format.rs:7:36:7:44 | precision |
14
| gen_format_args_expr.rs:7:19:7:21 | {b} | gen_format_args_expr.rs:7:20:7:20 | b |
25
| gen_format_args_expr.rs:7:27:7:31 | {a:?} | gen_format_args_expr.rs:7:28:7:28 | a |
36
| gen_format_args_expr.rs:9:19:9:21 | {x} | gen_format_args_expr.rs:9:20:9:20 | x |

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

+22-11
Original file line numberDiff line numberDiff line change
@@ -752,15 +752,18 @@ edges
752752
| test.rs:344:23:344:23 | a | test.rs:344:13:344:19 | Some(...) | |
753753
| test.rs:344:32:344:54 | ...::panic_fmt | test.rs:344:39:344:53 | "Expected some" | |
754754
| test.rs:344:32:344:54 | MacroExpr | test.rs:344:30:344:56 | { ... } | |
755+
| test.rs:344:32:344:54 | panic!... | test.rs:344:32:344:54 | MacroExpr | |
755756
| test.rs:344:39:344:53 | "Expected some" | test.rs:344:39:344:53 | FormatArgsExpr | |
757+
| test.rs:344:39:344:53 | ...::const_format_args!... | test.rs:344:39:344:53 | MacroExpr | |
758+
| test.rs:344:39:344:53 | ...::panic_2021!... | test.rs:344:39:344:53 | MacroExpr | |
756759
| test.rs:344:39:344:53 | ...::panic_fmt(...) | test.rs:344:39:344:53 | { ... } | |
757760
| test.rs:344:39:344:53 | ExprStmt | test.rs:344:32:344:54 | ...::panic_fmt | |
758-
| test.rs:344:39:344:53 | FormatArgsExpr | test.rs:344:39:344:53 | MacroExpr | |
759-
| test.rs:344:39:344:53 | MacroExpr | test.rs:344:32:344:54 | MacroExpr | |
761+
| test.rs:344:39:344:53 | FormatArgsExpr | test.rs:344:39:344:53 | ...::const_format_args!... | |
762+
| test.rs:344:39:344:53 | MacroExpr | test.rs:344:32:344:54 | panic!... | |
760763
| test.rs:344:39:344:53 | MacroExpr | test.rs:344:39:344:53 | ...::panic_fmt(...) | |
761764
| test.rs:344:39:344:53 | MacroStmts | test.rs:344:39:344:53 | ExprStmt | |
762765
| test.rs:344:39:344:53 | MacroStmts | test.rs:344:39:344:53 | MacroStmts | |
763-
| test.rs:344:39:344:53 | { ... } | test.rs:344:39:344:53 | MacroExpr | |
766+
| test.rs:344:39:344:53 | { ... } | test.rs:344:39:344:53 | ...::panic_2021!... | |
764767
| test.rs:345:9:345:9 | n | test.rs:343:46:346:5 | { ... } | |
765768
| test.rs:348:5:354:5 | enter fn test_let_with_return | test.rs:348:29:348:29 | m | |
766769
| test.rs:348:5:354:5 | exit fn test_let_with_return (normal) | test.rs:348:5:354:5 | exit fn test_let_with_return | |
@@ -835,14 +838,16 @@ edges
835838
| test.rs:392:26:394:5 | { ... } | test.rs:392:5:394:5 | exit fn say_hello (normal) | |
836839
| test.rs:393:9:393:33 | ...::_print | test.rs:393:18:393:32 | "hello, world!\\n" | |
837840
| test.rs:393:9:393:33 | MacroExpr | test.rs:392:26:394:5 | { ... } | |
841+
| test.rs:393:9:393:33 | println!... | test.rs:393:9:393:33 | MacroExpr | |
838842
| test.rs:393:9:393:34 | ExprStmt | test.rs:393:18:393:32 | MacroStmts | |
839843
| test.rs:393:18:393:32 | "hello, world!\\n" | test.rs:393:18:393:32 | FormatArgsExpr | |
840844
| test.rs:393:18:393:32 | ...::_print(...) | test.rs:393:18:393:32 | { ... } | |
845+
| test.rs:393:18:393:32 | ...::format_args_nl!... | test.rs:393:18:393:32 | MacroExpr | |
841846
| test.rs:393:18:393:32 | ExprStmt | test.rs:393:9:393:33 | ...::_print | |
842-
| test.rs:393:18:393:32 | FormatArgsExpr | test.rs:393:18:393:32 | MacroExpr | |
847+
| test.rs:393:18:393:32 | FormatArgsExpr | test.rs:393:18:393:32 | ...::format_args_nl!... | |
843848
| test.rs:393:18:393:32 | MacroExpr | test.rs:393:18:393:32 | ...::_print(...) | |
844849
| test.rs:393:18:393:32 | MacroStmts | test.rs:393:18:393:32 | ExprStmt | |
845-
| test.rs:393:18:393:32 | { ... } | test.rs:393:9:393:33 | MacroExpr | |
850+
| test.rs:393:18:393:32 | { ... } | test.rs:393:9:393:33 | println!... | |
846851
| test.rs:396:5:415:5 | enter fn async_block | test.rs:396:26:396:26 | b | |
847852
| test.rs:396:5:415:5 | exit fn async_block (normal) | test.rs:396:5:415:5 | exit fn async_block | |
848853
| test.rs:396:26:396:26 | b | test.rs:396:26:396:32 | ...: bool | match |
@@ -855,29 +860,33 @@ edges
855860
| test.rs:397:26:399:9 | { ... } | test.rs:397:13:397:22 | say_godbye | |
856861
| test.rs:398:13:398:41 | ...::_print | test.rs:398:22:398:40 | "godbye, everyone!\\n" | |
857862
| test.rs:398:13:398:41 | MacroExpr | test.rs:397:26:399:9 | exit { ... } (normal) | |
863+
| test.rs:398:13:398:41 | println!... | test.rs:398:13:398:41 | MacroExpr | |
858864
| test.rs:398:13:398:42 | ExprStmt | test.rs:398:22:398:40 | MacroStmts | |
859865
| test.rs:398:22:398:40 | "godbye, everyone!\\n" | test.rs:398:22:398:40 | FormatArgsExpr | |
860866
| test.rs:398:22:398:40 | ...::_print(...) | test.rs:398:22:398:40 | { ... } | |
867+
| test.rs:398:22:398:40 | ...::format_args_nl!... | test.rs:398:22:398:40 | MacroExpr | |
861868
| test.rs:398:22:398:40 | ExprStmt | test.rs:398:13:398:41 | ...::_print | |
862-
| test.rs:398:22:398:40 | FormatArgsExpr | test.rs:398:22:398:40 | MacroExpr | |
869+
| test.rs:398:22:398:40 | FormatArgsExpr | test.rs:398:22:398:40 | ...::format_args_nl!... | |
863870
| test.rs:398:22:398:40 | MacroExpr | test.rs:398:22:398:40 | ...::_print(...) | |
864871
| test.rs:398:22:398:40 | MacroStmts | test.rs:398:22:398:40 | ExprStmt | |
865-
| test.rs:398:22:398:40 | { ... } | test.rs:398:13:398:41 | MacroExpr | |
872+
| test.rs:398:22:398:40 | { ... } | test.rs:398:13:398:41 | println!... | |
866873
| test.rs:400:9:402:10 | let ... = ... | test.rs:400:31:402:9 | { ... } | |
867874
| test.rs:400:13:400:27 | say_how_are_you | test.rs:403:9:403:28 | let ... = ... | match |
868875
| test.rs:400:31:402:9 | enter { ... } | test.rs:401:13:401:37 | ExprStmt | |
869876
| test.rs:400:31:402:9 | exit { ... } (normal) | test.rs:400:31:402:9 | exit { ... } | |
870877
| test.rs:400:31:402:9 | { ... } | test.rs:400:13:400:27 | say_how_are_you | |
871878
| test.rs:401:13:401:36 | ...::_print | test.rs:401:22:401:35 | "how are you?\\n" | |
872879
| test.rs:401:13:401:36 | MacroExpr | test.rs:400:31:402:9 | exit { ... } (normal) | |
880+
| test.rs:401:13:401:36 | println!... | test.rs:401:13:401:36 | MacroExpr | |
873881
| test.rs:401:13:401:37 | ExprStmt | test.rs:401:22:401:35 | MacroStmts | |
874882
| test.rs:401:22:401:35 | "how are you?\\n" | test.rs:401:22:401:35 | FormatArgsExpr | |
875883
| test.rs:401:22:401:35 | ...::_print(...) | test.rs:401:22:401:35 | { ... } | |
884+
| test.rs:401:22:401:35 | ...::format_args_nl!... | test.rs:401:22:401:35 | MacroExpr | |
876885
| test.rs:401:22:401:35 | ExprStmt | test.rs:401:13:401:36 | ...::_print | |
877-
| test.rs:401:22:401:35 | FormatArgsExpr | test.rs:401:22:401:35 | MacroExpr | |
886+
| test.rs:401:22:401:35 | FormatArgsExpr | test.rs:401:22:401:35 | ...::format_args_nl!... | |
878887
| test.rs:401:22:401:35 | MacroExpr | test.rs:401:22:401:35 | ...::_print(...) | |
879888
| test.rs:401:22:401:35 | MacroStmts | test.rs:401:22:401:35 | ExprStmt | |
880-
| test.rs:401:22:401:35 | { ... } | test.rs:401:13:401:36 | MacroExpr | |
889+
| test.rs:401:22:401:35 | { ... } | test.rs:401:13:401:36 | println!... | |
881890
| test.rs:403:9:403:28 | let ... = ... | test.rs:403:20:403:27 | { ... } | |
882891
| test.rs:403:13:403:16 | noop | test.rs:404:9:404:26 | ExprStmt | match |
883892
| test.rs:403:20:403:27 | { ... } | test.rs:403:13:403:16 | noop | |
@@ -927,19 +936,21 @@ edges
927936
| test.rs:427:41:435:5 | { ... } | test.rs:427:5:435:5 | exit fn const_block_assert (normal) | |
928937
| test.rs:430:9:432:9 | ExprStmt | test.rs:431:13:431:50 | ExprStmt | |
929938
| test.rs:430:9:432:9 | { ... } | test.rs:434:9:434:10 | 42 | |
939+
| test.rs:431:13:431:49 | ...::panic_2021!... | test.rs:431:13:431:49 | MacroExpr | |
930940
| test.rs:431:13:431:49 | ...::panic_explicit | test.rs:431:13:431:49 | ...::panic_explicit(...) | |
931941
| test.rs:431:13:431:49 | ...::panic_explicit(...) | test.rs:431:13:431:49 | { ... } | |
932942
| test.rs:431:13:431:49 | ExprStmt | test.rs:431:13:431:49 | MacroStmts | |
933943
| test.rs:431:13:431:49 | ExprStmt | test.rs:431:13:431:49 | panic_cold_explicit | |
934944
| test.rs:431:13:431:49 | MacroExpr | test.rs:430:9:432:9 | { ... } | |
935945
| test.rs:431:13:431:49 | MacroExpr | test.rs:431:13:431:49 | { ... } | |
936946
| test.rs:431:13:431:49 | MacroStmts | test.rs:431:13:431:49 | fn panic_cold_explicit | |
947+
| test.rs:431:13:431:49 | assert!... | test.rs:431:13:431:49 | MacroExpr | |
937948
| test.rs:431:13:431:49 | enter fn panic_cold_explicit | test.rs:431:13:431:49 | ...::panic_explicit | |
938949
| test.rs:431:13:431:49 | exit fn panic_cold_explicit (normal) | test.rs:431:13:431:49 | exit fn panic_cold_explicit | |
939950
| test.rs:431:13:431:49 | fn panic_cold_explicit | test.rs:431:13:431:49 | ExprStmt | |
940951
| test.rs:431:13:431:49 | panic_cold_explicit | test.rs:431:13:431:49 | panic_cold_explicit(...) | |
941952
| test.rs:431:13:431:49 | panic_cold_explicit(...) | test.rs:431:13:431:49 | { ... } | |
942-
| test.rs:431:13:431:49 | { ... } | test.rs:431:13:431:49 | MacroExpr | |
953+
| test.rs:431:13:431:49 | { ... } | test.rs:431:13:431:49 | ...::panic_2021!... | |
943954
| test.rs:431:13:431:49 | { ... } | test.rs:431:13:431:49 | exit fn panic_cold_explicit (normal) | |
944955
| test.rs:431:13:431:49 | { ... } | test.rs:431:21:431:48 | if ... {...} | |
945956
| test.rs:431:13:431:50 | ExprStmt | test.rs:431:21:431:48 | MacroStmts | |
@@ -951,7 +962,7 @@ edges
951962
| test.rs:431:21:431:48 | [boolean(false)] ! ... | test.rs:431:21:431:48 | if ... {...} | false |
952963
| test.rs:431:21:431:48 | [boolean(true)] ! ... | test.rs:431:13:431:49 | ExprStmt | true |
953964
| test.rs:431:21:431:48 | if ... {...} | test.rs:431:21:431:48 | { ... } | |
954-
| test.rs:431:21:431:48 | { ... } | test.rs:431:13:431:49 | MacroExpr | |
965+
| test.rs:431:21:431:48 | { ... } | test.rs:431:13:431:49 | assert!... | |
955966
| test.rs:431:48:431:48 | 0 | test.rs:431:21:431:48 | ... > ... | |
956967
| test.rs:434:9:434:10 | 42 | test.rs:427:41:435:5 | { ... } | |
957968
| test.rs:437:5:446:5 | enter fn const_block_panic | test.rs:438:9:438:30 | Const | |

‎rust/ql/test/library-tests/dataflow/global/inline-flow-partial.expected

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
edges
2+
#select

0 commit comments

Comments
 (0)