Skip to content

Commit 5c64a8c

Browse files
paldepindpaldepind
committedJan 3, 2025·
Rust: Accept expected changes and fix other CI complaints
·
codeql-cli/v2.21.1codeql-cli/latest
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

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

+122
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
localStep
2+
| main.rs:5:11:5:11 | [SSA] i | main.rs:6:19:6:19 | i |
3+
| main.rs:5:11:5:11 | i | main.rs:5:11:5:11 | [SSA] i |
4+
| main.rs:5:11:5:16 | ...: i64 | main.rs:5:11:5:11 | i |
5+
| main.rs:6:5:6:20 | MacroExpr | main.rs:5:29:7:1 | { ... } |
6+
| main.rs:6:5:6:20 | res | main.rs:6:13:6:19 | { ... } |
7+
| main.rs:6:13:6:19 | ...::format(...) | main.rs:6:5:6:20 | res |
8+
| main.rs:6:13:6:19 | FormatArgsExpr | main.rs:6:13:6:19 | MacroExpr |
9+
| main.rs:6:13:6:19 | { ... } | main.rs:6:13:6:19 | ...::must_use(...) |
10+
| main.rs:9:17:9:17 | [SSA] i | main.rs:10:5:10:5 | i |
11+
| main.rs:9:17:9:17 | i | main.rs:9:17:9:17 | [SSA] i |
12+
| main.rs:9:17:9:24 | ...: usize | main.rs:9:17:9:17 | i |
13+
| main.rs:10:5:10:5 | i | main.rs:9:36:11:1 | { ... } |
14+
| main.rs:13:17:13:23 | ...: i64 | main.rs:13:17:13:18 | _i |
15+
| main.rs:14:5:14:12 | "source" | main.rs:13:42:15:1 | { ... } |
16+
| main.rs:17:15:17:15 | [SSA] s | main.rs:18:20:18:20 | s |
17+
| main.rs:17:15:17:15 | s | main.rs:17:15:17:15 | [SSA] s |
18+
| main.rs:17:15:17:21 | ...: ... | main.rs:17:15:17:15 | s |
19+
| main.rs:18:14:18:20 | FormatArgsExpr | main.rs:18:14:18:20 | MacroExpr |
20+
| main.rs:21:9:21:9 | [SSA] s | main.rs:22:20:22:20 | s |
21+
| main.rs:21:9:21:9 | s | main.rs:21:9:21:9 | [SSA] s |
22+
| main.rs:21:9:21:17 | ...: String | main.rs:21:9:21:9 | s |
23+
| main.rs:22:14:22:20 | FormatArgsExpr | main.rs:22:14:22:20 | MacroExpr |
24+
| main.rs:26:9:26:9 | [SSA] s | main.rs:27:19:27:19 | s |
25+
| main.rs:26:9:26:9 | s | main.rs:26:9:26:9 | [SSA] s |
26+
| main.rs:26:13:26:22 | source(...) | main.rs:26:9:26:9 | s |
27+
| main.rs:27:9:27:14 | [SSA] sliced | main.rs:28:16:28:21 | sliced |
28+
| main.rs:27:9:27:14 | sliced | main.rs:27:9:27:14 | [SSA] sliced |
29+
| main.rs:27:18:27:25 | &... | main.rs:27:9:27:14 | sliced |
30+
| main.rs:32:9:32:10 | [SSA] s1 | main.rs:35:14:35:15 | s1 |
31+
| main.rs:32:9:32:10 | s1 | main.rs:32:9:32:10 | [SSA] s1 |
32+
| main.rs:32:14:32:23 | source(...) | main.rs:32:9:32:10 | s1 |
33+
| main.rs:33:9:33:10 | [SSA] s2 | main.rs:36:14:36:15 | s2 |
34+
| main.rs:33:9:33:10 | s2 | main.rs:33:9:33:10 | [SSA] s2 |
35+
| main.rs:33:14:33:27 | "2".to_owned(...) | main.rs:33:9:33:10 | s2 |
36+
| main.rs:34:9:34:10 | [SSA] s3 | main.rs:35:19:35:20 | s3 |
37+
| main.rs:34:9:34:10 | s3 | main.rs:34:9:34:10 | [SSA] s3 |
38+
| main.rs:34:14:34:16 | "3" | main.rs:34:9:34:10 | s3 |
39+
| main.rs:35:9:35:10 | [SSA] s4 | main.rs:38:10:38:11 | s4 |
40+
| main.rs:35:9:35:10 | s4 | main.rs:35:9:35:10 | [SSA] s4 |
41+
| main.rs:35:14:35:20 | ... + ... | main.rs:35:9:35:10 | s4 |
42+
| main.rs:35:19:35:20 | s3 | main.rs:36:19:36:20 | s3 |
43+
| main.rs:36:9:36:10 | [SSA] s5 | main.rs:39:10:39:11 | s5 |
44+
| main.rs:36:9:36:10 | s5 | main.rs:36:9:36:10 | [SSA] s5 |
45+
| main.rs:36:14:36:20 | ... + ... | main.rs:36:9:36:10 | s5 |
46+
| main.rs:43:9:43:10 | [SSA] s1 | main.rs:46:34:46:35 | s1 |
47+
| main.rs:43:9:43:10 | s1 | main.rs:43:9:43:10 | [SSA] s1 |
48+
| main.rs:43:14:43:23 | source(...) | main.rs:43:9:43:10 | s1 |
49+
| main.rs:44:9:44:10 | [SSA] s2 | main.rs:47:34:47:35 | s2 |
50+
| main.rs:44:9:44:10 | s2 | main.rs:44:9:44:10 | [SSA] s2 |
51+
| main.rs:44:14:44:28 | "1".to_string(...) | main.rs:44:9:44:10 | s2 |
52+
| main.rs:51:9:51:10 | [SSA] s1 | main.rs:52:27:52:28 | s1 |
53+
| main.rs:51:9:51:10 | s1 | main.rs:51:9:51:10 | [SSA] s1 |
54+
| main.rs:51:14:51:29 | source_slice(...) | main.rs:51:9:51:10 | s1 |
55+
| main.rs:52:9:52:10 | [SSA] s2 | main.rs:53:10:53:11 | s2 |
56+
| main.rs:52:9:52:10 | s2 | main.rs:52:9:52:10 | [SSA] s2 |
57+
| main.rs:52:14:52:29 | ...::from(...) | main.rs:52:9:52:10 | s2 |
58+
| main.rs:57:9:57:10 | [SSA] s1 | main.rs:58:14:58:15 | s1 |
59+
| main.rs:57:9:57:10 | s1 | main.rs:57:9:57:10 | [SSA] s1 |
60+
| main.rs:57:14:57:29 | source_slice(...) | main.rs:57:9:57:10 | s1 |
61+
| main.rs:58:9:58:10 | [SSA] s2 | main.rs:59:10:59:11 | s2 |
62+
| main.rs:58:9:58:10 | s2 | main.rs:58:9:58:10 | [SSA] s2 |
63+
| main.rs:58:14:58:27 | s1.to_string(...) | main.rs:58:9:58:10 | s2 |
64+
| main.rs:63:9:63:9 | [SSA] s | main.rs:64:16:64:16 | s |
65+
| main.rs:63:9:63:9 | s | main.rs:63:9:63:9 | [SSA] s |
66+
| main.rs:63:13:63:22 | source(...) | main.rs:63:9:63:9 | s |
67+
| main.rs:68:9:68:9 | [SSA] s | main.rs:70:60:70:60 | s |
68+
| main.rs:68:9:68:9 | s | main.rs:68:9:68:9 | [SSA] s |
69+
| main.rs:68:13:68:22 | source(...) | main.rs:68:9:68:9 | s |
70+
| main.rs:70:9:70:18 | [SSA] formatted1 | main.rs:71:10:71:19 | formatted1 |
71+
| main.rs:70:9:70:18 | formatted1 | main.rs:70:9:70:18 | [SSA] formatted1 |
72+
| main.rs:70:22:70:62 | ...::format(...) | main.rs:70:9:70:18 | formatted1 |
73+
| main.rs:70:46:70:61 | FormatArgsExpr | main.rs:70:34:70:61 | MacroExpr |
74+
| main.rs:70:60:70:60 | s | main.rs:73:55:73:55 | s |
75+
| main.rs:73:9:73:18 | [SSA] formatted2 | main.rs:74:10:74:19 | formatted2 |
76+
| main.rs:73:9:73:18 | formatted2 | main.rs:73:9:73:18 | [SSA] formatted2 |
77+
| main.rs:73:22:73:60 | ...::format(...) | main.rs:73:9:73:18 | formatted2 |
78+
| main.rs:73:46:73:59 | FormatArgsExpr | main.rs:73:34:73:59 | MacroExpr |
79+
| main.rs:76:9:76:13 | [SSA] width | main.rs:77:56:77:60 | width |
80+
| main.rs:76:9:76:13 | width | main.rs:76:9:76:13 | [SSA] width |
81+
| main.rs:76:17:76:32 | source_usize(...) | main.rs:76:9:76:13 | width |
82+
| main.rs:77:9:77:18 | [SSA] formatted3 | main.rs:78:10:78:19 | formatted3 |
83+
| main.rs:77:9:77:18 | formatted3 | main.rs:77:9:77:18 | [SSA] formatted3 |
84+
| main.rs:77:22:77:75 | ...::format(...) | main.rs:77:9:77:18 | formatted3 |
85+
| main.rs:77:46:77:74 | FormatArgsExpr | main.rs:77:34:77:74 | MacroExpr |
86+
| main.rs:82:9:82:10 | [SSA] s1 | main.rs:86:24:86:25 | s1 |
87+
| main.rs:82:9:82:10 | s1 | main.rs:82:9:82:10 | [SSA] s1 |
88+
| main.rs:82:14:82:23 | source(...) | main.rs:82:9:82:10 | s1 |
89+
| main.rs:83:9:83:10 | [SSA] s2 | main.rs:88:20:88:21 | s2 |
90+
| main.rs:83:9:83:10 | s2 | main.rs:83:9:83:10 | [SSA] s2 |
91+
| main.rs:83:14:83:16 | "2" | main.rs:83:9:83:10 | s2 |
92+
| main.rs:84:9:84:10 | [SSA] s3 | main.rs:87:29:87:30 | s3 |
93+
| main.rs:84:9:84:10 | s3 | main.rs:84:9:84:10 | [SSA] s3 |
94+
| main.rs:84:14:84:16 | "3" | main.rs:84:9:84:10 | s3 |
95+
| main.rs:86:10:86:26 | res | main.rs:86:18:86:25 | { ... } |
96+
| main.rs:86:18:86:25 | ...::format(...) | main.rs:86:10:86:26 | res |
97+
| main.rs:86:18:86:25 | ...::must_use(...) | main.rs:86:10:86:26 | MacroExpr |
98+
| main.rs:86:18:86:25 | FormatArgsExpr | main.rs:86:18:86:25 | MacroExpr |
99+
| main.rs:86:18:86:25 | { ... } | main.rs:86:18:86:25 | ...::must_use(...) |
100+
| main.rs:86:24:86:25 | s1 | main.rs:87:20:87:21 | s1 |
101+
| main.rs:87:10:87:33 | res | main.rs:87:18:87:32 | { ... } |
102+
| main.rs:87:18:87:32 | ...::format(...) | main.rs:87:10:87:33 | res |
103+
| main.rs:87:18:87:32 | ...::must_use(...) | main.rs:87:10:87:33 | MacroExpr |
104+
| main.rs:87:18:87:32 | FormatArgsExpr | main.rs:87:18:87:32 | MacroExpr |
105+
| main.rs:87:18:87:32 | { ... } | main.rs:87:18:87:32 | ...::must_use(...) |
106+
| main.rs:87:29:87:30 | s3 | main.rs:88:29:88:30 | s3 |
107+
| main.rs:88:10:88:33 | res | main.rs:88:18:88:32 | { ... } |
108+
| main.rs:88:18:88:32 | ...::format(...) | main.rs:88:10:88:33 | res |
109+
| main.rs:88:18:88:32 | ...::must_use(...) | main.rs:88:10:88:33 | MacroExpr |
110+
| main.rs:88:18:88:32 | FormatArgsExpr | main.rs:88:18:88:32 | MacroExpr |
111+
| main.rs:88:18:88:32 | { ... } | main.rs:88:18:88:32 | ...::must_use(...) |
112+
storeStep
113+
| file://:0:0:0:0 | [summary] to write: ReturnValue.Variant[crate::result::Result::Ok(0)] in repo:https://github.com/seanmonstar/reqwest:reqwest::_::<crate::blocking::response::Response>::text | Ok | file://:0:0:0:0 | [summary] to write: ReturnValue in repo:https://github.com/seanmonstar/reqwest:reqwest::_::<crate::blocking::response::Response>::text |
114+
| main.rs:27:19:27:25 | s[...] | &ref | main.rs:27:18:27:25 | &... |
115+
| main.rs:46:34:46:35 | s1 | &ref | main.rs:46:33:46:35 | &s1 |
116+
| main.rs:47:34:47:35 | s2 | &ref | main.rs:47:33:47:35 | &s2 |
117+
readStep
118+
| file://:0:0:0:0 | [summary param] self in lang:core::_::<crate::option::Option>::unwrap | Some | file://:0:0:0:0 | [summary] read: Argument[self].Variant[crate::option::Option::Some(0)] in lang:core::_::<crate::option::Option>::unwrap |
119+
| file://:0:0:0:0 | [summary param] self in lang:core::_::<crate::option::Option>::unwrap_or | Some | file://:0:0:0:0 | [summary] read: Argument[self].Variant[crate::option::Option::Some(0)] in lang:core::_::<crate::option::Option>::unwrap_or |
120+
| file://:0:0:0:0 | [summary param] self in lang:core::_::<crate::result::Result>::unwrap | Ok | file://:0:0:0:0 | [summary] read: Argument[self].Variant[crate::result::Result::Ok(0)] in lang:core::_::<crate::result::Result>::unwrap |
121+
| file://:0:0:0:0 | [summary param] self in lang:core::_::<crate::result::Result>::unwrap_or | Ok | file://:0:0:0:0 | [summary] read: Argument[self].Variant[crate::result::Result::Ok(0)] in lang:core::_::<crate::result::Result>::unwrap_or |
122+
| main.rs:27:19:27:19 | s | array[] | main.rs:27:19:27:25 | s[...] |

‎rust/ql/test/library-tests/dataflow/taint/TaintFlowStep.expected

+6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1+
| file://:0:0:0:0 | [summary param] 0 in lang:alloc::_::crate::fmt::format | file://:0:0:0:0 | [summary] to write: ReturnValue in lang:alloc::_::crate::fmt::format | MaD:9 |
12
| file://:0:0:0:0 | [summary param] self in lang:alloc::_::<crate::string::String>::as_str | file://:0:0:0:0 | [summary] to write: ReturnValue in lang:alloc::_::<crate::string::String>::as_str | MaD:7 |
23
| file://:0:0:0:0 | [summary param] self in repo:https://github.com/seanmonstar/reqwest:reqwest::_::<crate::blocking::response::Response>::text | file://:0:0:0:0 | [summary] to write: ReturnValue.Variant[crate::result::Result::Ok(0)] in repo:https://github.com/seanmonstar/reqwest:reqwest::_::<crate::blocking::response::Response>::text | MaD:0 |
34
| main.rs:4:5:4:8 | 1000 | main.rs:4:5:4:12 | ... + ... | |
45
| main.rs:4:12:4:12 | i | main.rs:4:5:4:12 | ... + ... | |
6+
| main.rs:8:20:8:20 | s | main.rs:8:14:8:20 | FormatArgsExpr | |
57
| main.rs:13:10:13:10 | a | main.rs:13:10:13:14 | ... + ... | |
68
| main.rs:13:14:13:14 | 1 | main.rs:13:10:13:14 | ... + ... | |
79
| main.rs:18:11:18:11 | a | main.rs:18:10:18:11 | - ... | |
810
| main.rs:23:13:23:13 | a | main.rs:23:13:23:19 | a as u8 | |
911
| main.rs:24:10:24:10 | b | main.rs:24:10:24:17 | b as i64 | |
12+
| main.rs:29:23:29:23 | i | main.rs:29:17:29:23 | FormatArgsExpr | |
13+
| main.rs:33:24:33:24 | s | main.rs:33:18:33:24 | FormatArgsExpr | |
1014
| main.rs:38:23:38:23 | s | main.rs:38:23:38:29 | s[...] | |
15+
| main.rs:49:24:49:24 | i | main.rs:49:18:49:24 | FormatArgsExpr | |
1116
| main.rs:54:14:54:16 | arr | main.rs:54:14:54:19 | arr[1] | |
1217
| main.rs:64:24:64:24 | s | main.rs:64:24:64:27 | s[1] | |
18+
| main.rs:64:24:64:27 | s[1] | main.rs:64:18:64:27 | FormatArgsExpr | |
1319
| main.rs:69:9:69:12 | arr2 | main.rs:69:9:69:15 | arr2[1] | |

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

+16-8
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@ edges
66
| variables.rs:3:23:5:1 | { ... } | variables.rs:3:1:5:1 | exit fn print_str (normal) | |
77
| variables.rs:4:5:4:21 | ...::_print | variables.rs:4:14:4:17 | "{}\\n" | |
88
| variables.rs:4:5:4:21 | MacroExpr | variables.rs:3:23:5:1 | { ... } | |
9+
| variables.rs:4:5:4:21 | println!... | variables.rs:4:5:4:21 | MacroExpr | |
910
| variables.rs:4:5:4:22 | ExprStmt | variables.rs:4:14:4:20 | MacroStmts | |
1011
| variables.rs:4:14:4:17 | "{}\\n" | variables.rs:4:20:4:20 | s | |
1112
| variables.rs:4:14:4:20 | ...::_print(...) | variables.rs:4:14:4:20 | { ... } | |
13+
| variables.rs:4:14:4:20 | ...::format_args_nl!... | variables.rs:4:14:4:20 | MacroExpr | |
1214
| variables.rs:4:14:4:20 | ExprStmt | variables.rs:4:5:4:21 | ...::_print | |
13-
| variables.rs:4:14:4:20 | FormatArgsExpr | variables.rs:4:14:4:20 | MacroExpr | |
15+
| variables.rs:4:14:4:20 | FormatArgsExpr | variables.rs:4:14:4:20 | ...::format_args_nl!... | |
1416
| variables.rs:4:14:4:20 | MacroExpr | variables.rs:4:14:4:20 | ...::_print(...) | |
1517
| variables.rs:4:14:4:20 | MacroStmts | variables.rs:4:14:4:20 | ExprStmt | |
16-
| variables.rs:4:14:4:20 | { ... } | variables.rs:4:5:4:21 | MacroExpr | |
18+
| variables.rs:4:14:4:20 | { ... } | variables.rs:4:5:4:21 | println!... | |
1719
| variables.rs:4:20:4:20 | s | variables.rs:4:14:4:20 | FormatArgsExpr | |
1820
| variables.rs:7:1:9:1 | enter fn print_i64 | variables.rs:7:14:7:14 | i | |
1921
| variables.rs:7:1:9:1 | exit fn print_i64 (normal) | variables.rs:7:1:9:1 | exit fn print_i64 | |
@@ -22,14 +24,16 @@ edges
2224
| variables.rs:7:22:9:1 | { ... } | variables.rs:7:1:9:1 | exit fn print_i64 (normal) | |
2325
| variables.rs:8:5:8:21 | ...::_print | variables.rs:8:14:8:17 | "{}\\n" | |
2426
| variables.rs:8:5:8:21 | MacroExpr | variables.rs:7:22:9:1 | { ... } | |
27+
| variables.rs:8:5:8:21 | println!... | variables.rs:8:5:8:21 | MacroExpr | |
2528
| variables.rs:8:5:8:22 | ExprStmt | variables.rs:8:14:8:20 | MacroStmts | |
2629
| variables.rs:8:14:8:17 | "{}\\n" | variables.rs:8:20:8:20 | i | |
2730
| variables.rs:8:14:8:20 | ...::_print(...) | variables.rs:8:14:8:20 | { ... } | |
31+
| variables.rs:8:14:8:20 | ...::format_args_nl!... | variables.rs:8:14:8:20 | MacroExpr | |
2832
| variables.rs:8:14:8:20 | ExprStmt | variables.rs:8:5:8:21 | ...::_print | |
29-
| variables.rs:8:14:8:20 | FormatArgsExpr | variables.rs:8:14:8:20 | MacroExpr | |
33+
| variables.rs:8:14:8:20 | FormatArgsExpr | variables.rs:8:14:8:20 | ...::format_args_nl!... | |
3034
| variables.rs:8:14:8:20 | MacroExpr | variables.rs:8:14:8:20 | ...::_print(...) | |
3135
| variables.rs:8:14:8:20 | MacroStmts | variables.rs:8:14:8:20 | ExprStmt | |
32-
| variables.rs:8:14:8:20 | { ... } | variables.rs:8:5:8:21 | MacroExpr | |
36+
| variables.rs:8:14:8:20 | { ... } | variables.rs:8:5:8:21 | println!... | |
3337
| variables.rs:8:20:8:20 | i | variables.rs:8:14:8:20 | FormatArgsExpr | |
3438
| variables.rs:11:1:13:1 | enter fn print_i64_ref | variables.rs:11:18:11:18 | i | |
3539
| variables.rs:11:1:13:1 | exit fn print_i64_ref (normal) | variables.rs:11:1:13:1 | exit fn print_i64_ref | |
@@ -218,9 +222,10 @@ edges
218222
| variables.rs:94:39:94:42 | "x5" | variables.rs:94:34:94:43 | Some(...) | |
219223
| variables.rs:96:13:96:19 | "not yet implemented" | variables.rs:96:13:96:19 | ...::panic(...) | |
220224
| variables.rs:96:13:96:19 | ...::panic | variables.rs:96:13:96:19 | "not yet implemented" | |
221-
| variables.rs:96:13:96:19 | ...::panic(...) | variables.rs:96:13:96:19 | MacroExpr | |
225+
| variables.rs:96:13:96:19 | ...::panic(...) | variables.rs:96:13:96:19 | todo!... | |
222226
| variables.rs:96:13:96:19 | MacroExpr | variables.rs:95:14:97:9 | { ... } | |
223227
| variables.rs:96:13:96:19 | MacroStmts | variables.rs:96:13:96:19 | ...::panic | |
228+
| variables.rs:96:13:96:19 | todo!... | variables.rs:96:13:96:19 | MacroExpr | |
224229
| variables.rs:98:5:98:13 | print_str | variables.rs:98:15:98:16 | x5 | |
225230
| variables.rs:98:5:98:17 | print_str(...) | variables.rs:93:19:99:1 | { ... } | |
226231
| variables.rs:98:5:98:18 | ExprStmt | variables.rs:98:5:98:13 | print_str | |
@@ -383,13 +388,15 @@ edges
383388
| variables.rs:175:43:177:9 | { ... } | variables.rs:171:5:180:5 | match msg { ... } | |
384389
| variables.rs:176:13:176:52 | ...::_print | variables.rs:176:22:176:51 | "Found an id in another range\\... | |
385390
| variables.rs:176:13:176:52 | MacroExpr | variables.rs:175:43:177:9 | { ... } | |
391+
| variables.rs:176:13:176:52 | println!... | variables.rs:176:13:176:52 | MacroExpr | |
386392
| variables.rs:176:22:176:51 | "Found an id in another range\\... | variables.rs:176:22:176:51 | FormatArgsExpr | |
387393
| variables.rs:176:22:176:51 | ...::_print(...) | variables.rs:176:22:176:51 | { ... } | |
394+
| variables.rs:176:22:176:51 | ...::format_args_nl!... | variables.rs:176:22:176:51 | MacroExpr | |
388395
| variables.rs:176:22:176:51 | ExprStmt | variables.rs:176:13:176:52 | ...::_print | |
389-
| variables.rs:176:22:176:51 | FormatArgsExpr | variables.rs:176:22:176:51 | MacroExpr | |
396+
| variables.rs:176:22:176:51 | FormatArgsExpr | variables.rs:176:22:176:51 | ...::format_args_nl!... | |
390397
| variables.rs:176:22:176:51 | MacroExpr | variables.rs:176:22:176:51 | ...::_print(...) | |
391398
| variables.rs:176:22:176:51 | MacroStmts | variables.rs:176:22:176:51 | ExprStmt | |
392-
| variables.rs:176:22:176:51 | { ... } | variables.rs:176:13:176:52 | MacroExpr | |
399+
| variables.rs:176:22:176:51 | { ... } | variables.rs:176:13:176:52 | println!... | |
393400
| variables.rs:178:9:178:29 | ...::Hello {...} | variables.rs:178:26:178:27 | id | match |
394401
| variables.rs:178:26:178:27 | id | variables.rs:179:13:179:21 | print_i64 | match |
395402
| variables.rs:179:13:179:21 | print_i64 | variables.rs:179:23:179:24 | id | |
@@ -1237,11 +1244,12 @@ edges
12371244
| variables.rs:554:5:555:26 | let ... = ... | variables.rs:555:23:555:24 | let ... = 37 | |
12381245
| variables.rs:554:9:554:22 | var_from_macro | variables.rs:556:5:556:30 | ExprStmt | match |
12391246
| variables.rs:555:9:555:25 | MacroExpr | variables.rs:554:9:554:22 | var_from_macro | |
1247+
| variables.rs:555:9:555:25 | let_in_macro!... | variables.rs:555:9:555:25 | MacroExpr | |
12401248
| variables.rs:555:9:555:25 | var_in_macro | variables.rs:555:9:555:25 | var_in_macro | match |
12411249
| variables.rs:555:9:555:25 | var_in_macro | variables.rs:555:23:555:24 | { ... } | |
12421250
| variables.rs:555:23:555:24 | 37 | variables.rs:555:9:555:25 | var_in_macro | |
12431251
| variables.rs:555:23:555:24 | let ... = 37 | variables.rs:555:23:555:24 | 37 | |
1244-
| variables.rs:555:23:555:24 | { ... } | variables.rs:555:9:555:25 | MacroExpr | |
1252+
| variables.rs:555:23:555:24 | { ... } | variables.rs:555:9:555:25 | let_in_macro!... | |
12451253
| variables.rs:556:5:556:13 | print_i64 | variables.rs:556:15:556:28 | var_from_macro | |
12461254
| variables.rs:556:5:556:29 | print_i64(...) | variables.rs:553:23:557:1 | { ... } | |
12471255
| variables.rs:556:5:556:30 | ExprStmt | variables.rs:556:5:556:13 | print_i64 | |

0 commit comments

Comments
 (0)
Please sign in to comment.