Skip to content

Commit 2d1ed65

Browse files
hvitvedhvitved
committed
update expected
1 parent fd5c873 commit 2d1ed65

28 files changed

+240
-366
lines changed

‎rust/ql/test/library-tests/dataflow/global/CONSISTENCY/PathResolutionConsistency.expected

Lines changed: 0 additions & 2 deletions
This file was deleted.

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

Lines changed: 43 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,41 @@ edges
66
| main.rs:17:9:17:9 | a | main.rs:18:10:18:10 | a | provenance | |
77
| main.rs:17:13:17:23 | get_data(...) | main.rs:17:9:17:9 | a | provenance | |
88
| main.rs:26:28:26:33 | ...: i64 | main.rs:27:24:27:24 | n | provenance | |
9-
| main.rs:27:10:27:14 | [post] * ... [MyStruct] | main.rs:27:11:27:14 | [post] self [&ref, MyStruct] | provenance | |
10-
| main.rs:27:11:27:14 | [post] self [&ref, MyStruct] | main.rs:26:17:26:25 | SelfParam [Return] [&ref, MyStruct] | provenance | |
9+
| main.rs:27:10:27:14 | [post] * ... [MyStruct] | main.rs:26:17:26:25 | SelfParam [Return] [&ref, MyStruct] | provenance | |
10+
| main.rs:27:10:27:14 | [post] * ... [MyStruct] | main.rs:27:11:27:14 | [post] self [&ref, &ref, MyStruct] | provenance | |
11+
| main.rs:27:11:27:14 | [post] self [&ref, &ref, MyStruct] | main.rs:26:17:26:25 | SelfParam [Return] [&ref, &ref, MyStruct] | provenance | |
1112
| main.rs:27:24:27:24 | n | main.rs:27:10:27:14 | [post] * ... [MyStruct] | provenance | |
12-
| main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | main.rs:31:11:31:14 | self [&ref, MyStruct] | provenance | |
13+
| main.rs:30:17:30:21 | SelfParam [&ref, &ref, MyStruct] | main.rs:31:11:31:14 | self [&ref, &ref, MyStruct] | provenance | |
14+
| main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | main.rs:31:10:31:14 | * ... [MyStruct] | provenance | |
1315
| main.rs:31:9:31:20 | ... .data | main.rs:30:31:32:5 | { ... } | provenance | |
16+
| main.rs:31:9:31:20 | ... .data | main.rs:30:31:32:5 | { ... } | provenance | |
17+
| main.rs:31:10:31:14 | * ... [MyStruct] | main.rs:31:9:31:20 | ... .data | provenance | |
1418
| main.rs:31:10:31:14 | * ... [MyStruct] | main.rs:31:9:31:20 | ... .data | provenance | |
15-
| main.rs:31:11:31:14 | self [&ref, MyStruct] | main.rs:31:10:31:14 | * ... [MyStruct] | provenance | |
19+
| main.rs:31:11:31:14 | self [&ref, &ref, MyStruct] | main.rs:31:10:31:14 | * ... [MyStruct] | provenance | |
20+
| main.rs:38:6:38:11 | [post] &mut a [&ref, &ref, MyStruct] | main.rs:38:11:38:11 | [post] a [&ref, MyStruct] | provenance | |
1621
| main.rs:38:6:38:11 | [post] &mut a [&ref, MyStruct] | main.rs:38:11:38:11 | [post] a [MyStruct] | provenance | |
22+
| main.rs:38:11:38:11 | [post] a [&ref, MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | provenance | |
23+
| main.rs:38:11:38:11 | [post] a [&ref, MyStruct] | main.rs:39:10:39:10 | a [&ref, MyStruct] | provenance | |
24+
| main.rs:38:11:38:11 | [post] a [&ref, MyStruct] | main.rs:39:10:39:21 | a.get_data() | provenance | |
1725
| main.rs:38:11:38:11 | [post] a [MyStruct] | main.rs:39:10:39:10 | a [MyStruct] | provenance | |
1826
| main.rs:38:23:38:31 | source(...) | main.rs:26:28:26:33 | ...: i64 | provenance | |
27+
| main.rs:38:23:38:31 | source(...) | main.rs:38:6:38:11 | [post] &mut a [&ref, &ref, MyStruct] | provenance | |
1928
| main.rs:38:23:38:31 | source(...) | main.rs:38:6:38:11 | [post] &mut a [&ref, MyStruct] | provenance | |
29+
| main.rs:39:10:39:10 | a [&ref, MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, &ref, MyStruct] | provenance | |
30+
| main.rs:39:10:39:10 | a [&ref, MyStruct] | main.rs:39:10:39:21 | a.get_data() | provenance | |
2031
| main.rs:39:10:39:10 | a [MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | provenance | |
2132
| main.rs:39:10:39:10 | a [MyStruct] | main.rs:39:10:39:21 | a.get_data() | provenance | |
33+
| main.rs:46:9:46:14 | [post] &mut a [&ref, &ref, MyStruct] | main.rs:46:14:46:14 | [post] a [&ref, MyStruct] | provenance | |
2234
| main.rs:46:9:46:14 | [post] &mut a [&ref, MyStruct] | main.rs:46:14:46:14 | [post] a [MyStruct] | provenance | |
35+
| main.rs:46:14:46:14 | [post] a [&ref, MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | provenance | |
36+
| main.rs:46:14:46:14 | [post] a [&ref, MyStruct] | main.rs:49:10:49:10 | a [&ref, MyStruct] | provenance | |
37+
| main.rs:46:14:46:14 | [post] a [&ref, MyStruct] | main.rs:49:10:49:21 | a.get_data() | provenance | |
2338
| main.rs:46:14:46:14 | [post] a [MyStruct] | main.rs:49:10:49:10 | a [MyStruct] | provenance | |
2439
| main.rs:48:15:48:23 | source(...) | main.rs:26:28:26:33 | ...: i64 | provenance | |
40+
| main.rs:48:15:48:23 | source(...) | main.rs:46:9:46:14 | [post] &mut a [&ref, &ref, MyStruct] | provenance | |
2541
| main.rs:48:15:48:23 | source(...) | main.rs:46:9:46:14 | [post] &mut a [&ref, MyStruct] | provenance | |
42+
| main.rs:49:10:49:10 | a [&ref, MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, &ref, MyStruct] | provenance | |
43+
| main.rs:49:10:49:10 | a [&ref, MyStruct] | main.rs:49:10:49:21 | a.get_data() | provenance | |
2644
| main.rs:49:10:49:10 | a [MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | provenance | |
2745
| main.rs:49:10:49:10 | a [MyStruct] | main.rs:49:10:49:21 | a.get_data() | provenance | |
2846
| main.rs:52:12:52:17 | ...: i64 | main.rs:53:10:53:10 | n | provenance | |
@@ -113,15 +131,13 @@ edges
113131
| main.rs:222:24:222:27 | self [MyInt] | main.rs:222:24:222:33 | self.value | provenance | |
114132
| main.rs:222:24:222:33 | self.value | main.rs:222:9:222:35 | MyInt {...} [MyInt] | provenance | |
115133
| main.rs:227:30:227:39 | ...: MyInt [MyInt] | main.rs:228:25:228:27 | rhs [MyInt] | provenance | |
116-
| main.rs:228:10:228:14 | [post] * ... [MyInt] | main.rs:228:11:228:14 | [post] self [&ref, MyInt] | provenance | |
117-
| main.rs:228:11:228:14 | [post] self [&ref, MyInt] | main.rs:227:19:227:27 | SelfParam [Return] [&ref, MyInt] | provenance | |
134+
| main.rs:228:10:228:14 | [post] * ... [MyInt] | main.rs:227:19:227:27 | SelfParam [Return] [&ref, MyInt] | provenance | |
118135
| main.rs:228:25:228:27 | rhs [MyInt] | main.rs:228:25:228:33 | rhs.value | provenance | |
119136
| main.rs:228:25:228:33 | rhs.value | main.rs:228:10:228:14 | [post] * ... [MyInt] | provenance | |
120-
| main.rs:235:14:235:18 | SelfParam [&ref, MyInt] | main.rs:236:12:236:15 | self [&ref, MyInt] | provenance | |
137+
| main.rs:235:14:235:18 | SelfParam [&ref, MyInt] | main.rs:236:11:236:15 | * ... [MyInt] | provenance | |
121138
| main.rs:236:9:236:22 | &... [&ref] | main.rs:235:38:237:5 | { ... } [&ref] | provenance | |
122139
| main.rs:236:10:236:22 | ... .value | main.rs:236:9:236:22 | &... [&ref] | provenance | |
123140
| main.rs:236:11:236:15 | * ... [MyInt] | main.rs:236:10:236:22 | ... .value | provenance | |
124-
| main.rs:236:12:236:15 | self [&ref, MyInt] | main.rs:236:11:236:15 | * ... [MyInt] | provenance | |
125141
| main.rs:242:9:242:9 | a [MyInt] | main.rs:244:13:244:13 | a [MyInt] | provenance | |
126142
| main.rs:242:13:242:38 | MyInt {...} [MyInt] | main.rs:242:9:242:9 | a [MyInt] | provenance | |
127143
| main.rs:242:28:242:36 | source(...) | main.rs:242:13:242:38 | MyInt {...} [MyInt] | provenance | |
@@ -187,24 +203,35 @@ nodes
187203
| main.rs:17:9:17:9 | a | semmle.label | a |
188204
| main.rs:17:13:17:23 | get_data(...) | semmle.label | get_data(...) |
189205
| main.rs:18:10:18:10 | a | semmle.label | a |
206+
| main.rs:26:17:26:25 | SelfParam [Return] [&ref, &ref, MyStruct] | semmle.label | SelfParam [Return] [&ref, &ref, MyStruct] |
190207
| main.rs:26:17:26:25 | SelfParam [Return] [&ref, MyStruct] | semmle.label | SelfParam [Return] [&ref, MyStruct] |
191208
| main.rs:26:28:26:33 | ...: i64 | semmle.label | ...: i64 |
192209
| main.rs:27:10:27:14 | [post] * ... [MyStruct] | semmle.label | [post] * ... [MyStruct] |
193-
| main.rs:27:11:27:14 | [post] self [&ref, MyStruct] | semmle.label | [post] self [&ref, MyStruct] |
210+
| main.rs:27:11:27:14 | [post] self [&ref, &ref, MyStruct] | semmle.label | [post] self [&ref, &ref, MyStruct] |
194211
| main.rs:27:24:27:24 | n | semmle.label | n |
212+
| main.rs:30:17:30:21 | SelfParam [&ref, &ref, MyStruct] | semmle.label | SelfParam [&ref, &ref, MyStruct] |
195213
| main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | semmle.label | SelfParam [&ref, MyStruct] |
196214
| main.rs:30:31:32:5 | { ... } | semmle.label | { ... } |
215+
| main.rs:30:31:32:5 | { ... } | semmle.label | { ... } |
197216
| main.rs:31:9:31:20 | ... .data | semmle.label | ... .data |
217+
| main.rs:31:9:31:20 | ... .data | semmle.label | ... .data |
218+
| main.rs:31:10:31:14 | * ... [MyStruct] | semmle.label | * ... [MyStruct] |
198219
| main.rs:31:10:31:14 | * ... [MyStruct] | semmle.label | * ... [MyStruct] |
199-
| main.rs:31:11:31:14 | self [&ref, MyStruct] | semmle.label | self [&ref, MyStruct] |
220+
| main.rs:31:11:31:14 | self [&ref, &ref, MyStruct] | semmle.label | self [&ref, &ref, MyStruct] |
221+
| main.rs:38:6:38:11 | [post] &mut a [&ref, &ref, MyStruct] | semmle.label | [post] &mut a [&ref, &ref, MyStruct] |
200222
| main.rs:38:6:38:11 | [post] &mut a [&ref, MyStruct] | semmle.label | [post] &mut a [&ref, MyStruct] |
223+
| main.rs:38:11:38:11 | [post] a [&ref, MyStruct] | semmle.label | [post] a [&ref, MyStruct] |
201224
| main.rs:38:11:38:11 | [post] a [MyStruct] | semmle.label | [post] a [MyStruct] |
202225
| main.rs:38:23:38:31 | source(...) | semmle.label | source(...) |
226+
| main.rs:39:10:39:10 | a [&ref, MyStruct] | semmle.label | a [&ref, MyStruct] |
203227
| main.rs:39:10:39:10 | a [MyStruct] | semmle.label | a [MyStruct] |
204228
| main.rs:39:10:39:21 | a.get_data() | semmle.label | a.get_data() |
229+
| main.rs:46:9:46:14 | [post] &mut a [&ref, &ref, MyStruct] | semmle.label | [post] &mut a [&ref, &ref, MyStruct] |
205230
| main.rs:46:9:46:14 | [post] &mut a [&ref, MyStruct] | semmle.label | [post] &mut a [&ref, MyStruct] |
231+
| main.rs:46:14:46:14 | [post] a [&ref, MyStruct] | semmle.label | [post] a [&ref, MyStruct] |
206232
| main.rs:46:14:46:14 | [post] a [MyStruct] | semmle.label | [post] a [MyStruct] |
207233
| main.rs:48:15:48:23 | source(...) | semmle.label | source(...) |
234+
| main.rs:49:10:49:10 | a [&ref, MyStruct] | semmle.label | a [&ref, MyStruct] |
208235
| main.rs:49:10:49:10 | a [MyStruct] | semmle.label | a [MyStruct] |
209236
| main.rs:49:10:49:21 | a.get_data() | semmle.label | a.get_data() |
210237
| main.rs:52:12:52:17 | ...: i64 | semmle.label | ...: i64 |
@@ -308,15 +335,13 @@ nodes
308335
| main.rs:227:19:227:27 | SelfParam [Return] [&ref, MyInt] | semmle.label | SelfParam [Return] [&ref, MyInt] |
309336
| main.rs:227:30:227:39 | ...: MyInt [MyInt] | semmle.label | ...: MyInt [MyInt] |
310337
| main.rs:228:10:228:14 | [post] * ... [MyInt] | semmle.label | [post] * ... [MyInt] |
311-
| main.rs:228:11:228:14 | [post] self [&ref, MyInt] | semmle.label | [post] self [&ref, MyInt] |
312338
| main.rs:228:25:228:27 | rhs [MyInt] | semmle.label | rhs [MyInt] |
313339
| main.rs:228:25:228:33 | rhs.value | semmle.label | rhs.value |
314340
| main.rs:235:14:235:18 | SelfParam [&ref, MyInt] | semmle.label | SelfParam [&ref, MyInt] |
315341
| main.rs:235:38:237:5 | { ... } [&ref] | semmle.label | { ... } [&ref] |
316342
| main.rs:236:9:236:22 | &... [&ref] | semmle.label | &... [&ref] |
317343
| main.rs:236:10:236:22 | ... .value | semmle.label | ... .value |
318344
| main.rs:236:11:236:15 | * ... [MyInt] | semmle.label | * ... [MyInt] |
319-
| main.rs:236:12:236:15 | self [&ref, MyInt] | semmle.label | self [&ref, MyInt] |
320345
| main.rs:242:9:242:9 | a [MyInt] | semmle.label | a [MyInt] |
321346
| main.rs:242:13:242:38 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
322347
| main.rs:242:28:242:36 | source(...) | semmle.label | source(...) |
@@ -381,9 +406,15 @@ nodes
381406
| main.rs:334:41:334:54 | async_source(...) | semmle.label | async_source(...) |
382407
| main.rs:335:10:335:10 | a | semmle.label | a |
383408
subpaths
409+
| main.rs:38:11:38:11 | [post] a [&ref, MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | main.rs:30:31:32:5 | { ... } | main.rs:39:10:39:21 | a.get_data() |
410+
| main.rs:38:23:38:31 | source(...) | main.rs:26:28:26:33 | ...: i64 | main.rs:26:17:26:25 | SelfParam [Return] [&ref, &ref, MyStruct] | main.rs:38:6:38:11 | [post] &mut a [&ref, &ref, MyStruct] |
384411
| main.rs:38:23:38:31 | source(...) | main.rs:26:28:26:33 | ...: i64 | main.rs:26:17:26:25 | SelfParam [Return] [&ref, MyStruct] | main.rs:38:6:38:11 | [post] &mut a [&ref, MyStruct] |
412+
| main.rs:39:10:39:10 | a [&ref, MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, &ref, MyStruct] | main.rs:30:31:32:5 | { ... } | main.rs:39:10:39:21 | a.get_data() |
385413
| main.rs:39:10:39:10 | a [MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | main.rs:30:31:32:5 | { ... } | main.rs:39:10:39:21 | a.get_data() |
414+
| main.rs:46:14:46:14 | [post] a [&ref, MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | main.rs:30:31:32:5 | { ... } | main.rs:49:10:49:21 | a.get_data() |
415+
| main.rs:48:15:48:23 | source(...) | main.rs:26:28:26:33 | ...: i64 | main.rs:26:17:26:25 | SelfParam [Return] [&ref, &ref, MyStruct] | main.rs:46:9:46:14 | [post] &mut a [&ref, &ref, MyStruct] |
386416
| main.rs:48:15:48:23 | source(...) | main.rs:26:28:26:33 | ...: i64 | main.rs:26:17:26:25 | SelfParam [Return] [&ref, MyStruct] | main.rs:46:9:46:14 | [post] &mut a [&ref, MyStruct] |
417+
| main.rs:49:10:49:10 | a [&ref, MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, &ref, MyStruct] | main.rs:30:31:32:5 | { ... } | main.rs:49:10:49:21 | a.get_data() |
387418
| main.rs:49:10:49:10 | a [MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | main.rs:30:31:32:5 | { ... } | main.rs:49:10:49:21 | a.get_data() |
388419
| main.rs:67:26:67:26 | a | main.rs:61:17:61:22 | ...: i64 | main.rs:61:32:63:1 | { ... } | main.rs:67:13:67:27 | pass_through(...) |
389420
| main.rs:72:26:75:5 | { ... } | main.rs:61:17:61:22 | ...: i64 | main.rs:61:32:63:1 | { ... } | main.rs:72:13:75:6 | pass_through(...) |

‎rust/ql/test/library-tests/dataflow/global/viableCallable.expected

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
| main.rs:13:5:13:13 | source(...) | main.rs:1:1:3:1 | fn source |
22
| main.rs:17:13:17:23 | get_data(...) | main.rs:12:1:14:1 | fn get_data |
33
| main.rs:18:5:18:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
4+
| main.rs:27:10:27:14 | * ... | file://:0:0:0:0 | fn deref |
5+
| main.rs:27:10:27:14 | * ... | file://:0:0:0:0 | fn deref |
6+
| main.rs:31:10:31:14 | * ... | file://:0:0:0:0 | fn deref |
7+
| main.rs:31:10:31:14 | * ... | file://:0:0:0:0 | fn deref |
48
| main.rs:37:5:37:22 | sink(...) | main.rs:5:1:7:1 | fn sink |
59
| main.rs:37:10:37:21 | a.get_data() | main.rs:30:5:32:5 | fn get_data |
610
| main.rs:38:5:38:32 | ... .set_data(...) | main.rs:26:5:28:5 | fn set_data |
@@ -59,6 +63,10 @@
5963
| main.rs:212:13:212:34 | ...::new(...) | main.rs:205:5:208:5 | fn new |
6064
| main.rs:212:24:212:33 | source(...) | main.rs:1:1:3:1 | fn source |
6165
| main.rs:214:5:214:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
66+
| main.rs:228:10:228:14 | * ... | file://:0:0:0:0 | fn deref |
67+
| main.rs:228:10:228:14 | * ... | file://:0:0:0:0 | fn deref |
68+
| main.rs:236:11:236:15 | * ... | file://:0:0:0:0 | fn deref |
69+
| main.rs:236:11:236:15 | * ... | file://:0:0:0:0 | fn deref |
6270
| main.rs:242:28:242:36 | source(...) | main.rs:1:1:3:1 | fn source |
6371
| main.rs:244:13:244:17 | ... + ... | main.rs:220:5:223:5 | fn add |
6472
| main.rs:245:5:245:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
@@ -75,6 +83,8 @@
7583
| main.rs:266:5:266:10 | ... *= ... | main.rs:227:5:229:5 | fn mul_assign |
7684
| main.rs:267:5:267:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
7785
| main.rs:270:28:270:37 | source(...) | main.rs:1:1:3:1 | fn source |
86+
| main.rs:272:13:272:29 | * ... | file://:0:0:0:0 | fn deref |
87+
| main.rs:272:13:272:29 | * ... | file://:0:0:0:0 | fn deref |
7888
| main.rs:272:14:272:29 | ...::deref(...) | main.rs:235:5:237:5 | fn deref |
7989
| main.rs:273:5:273:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
8090
| main.rs:275:28:275:37 | source(...) | main.rs:1:1:3:1 | fn source |

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

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)