Skip to content

Commit f99ee9c

Browse files
committed
Rust: Update data flow test to use implicit borrow
1 parent 09c709e commit f99ee9c

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ edges
1313
| main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | main.rs:31:9:31:12 | self [&ref, MyStruct] | provenance | |
1414
| main.rs:31:9:31:12 | self [&ref, MyStruct] | main.rs:31:9:31:17 | self.data | provenance | |
1515
| main.rs:31:9:31:17 | self.data | main.rs:30:31:32:5 | { ... } | provenance | |
16-
| main.rs:38:6:38:11 | [post] &mut a [&ref, MyStruct] | main.rs:38:11:38:11 | [post] a [MyStruct] | provenance | |
17-
| main.rs:38:11:38:11 | [post] a [MyStruct] | main.rs:39:10:39:10 | a [MyStruct] | provenance | |
18-
| main.rs:38:23:38:31 | source(...) | main.rs:26:28:26:33 | ...: i64 | provenance | |
19-
| main.rs:38:23:38:31 | source(...) | main.rs:38:6:38:11 | [post] &mut a [&ref, MyStruct] | provenance | |
16+
| main.rs:38:5:38:5 | [post] a [MyStruct] | main.rs:39:10:39:10 | a [MyStruct] | provenance | |
17+
| main.rs:38:16:38:24 | source(...) | main.rs:26:28:26:33 | ...: i64 | provenance | |
18+
| main.rs:38:16:38:24 | source(...) | main.rs:38:5:38:5 | [post] a [MyStruct] | provenance | |
2019
| main.rs:39:10:39:10 | a [MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | provenance | |
2120
| main.rs:39:10:39:10 | a [MyStruct] | main.rs:39:10:39:21 | a.get_data() | provenance | |
2221
| main.rs:46:9:46:14 | [post] &mut a [&ref, MyStruct] | main.rs:46:14:46:14 | [post] a [MyStruct] | provenance | |
@@ -233,9 +232,8 @@ nodes
233232
| main.rs:30:31:32:5 | { ... } | semmle.label | { ... } |
234233
| main.rs:31:9:31:12 | self [&ref, MyStruct] | semmle.label | self [&ref, MyStruct] |
235234
| main.rs:31:9:31:17 | self.data | semmle.label | self.data |
236-
| main.rs:38:6:38:11 | [post] &mut a [&ref, MyStruct] | semmle.label | [post] &mut a [&ref, MyStruct] |
237-
| main.rs:38:11:38:11 | [post] a [MyStruct] | semmle.label | [post] a [MyStruct] |
238-
| main.rs:38:23:38:31 | source(...) | semmle.label | source(...) |
235+
| main.rs:38:5:38:5 | [post] a [MyStruct] | semmle.label | [post] a [MyStruct] |
236+
| main.rs:38:16:38:24 | source(...) | semmle.label | source(...) |
239237
| main.rs:39:10:39:10 | a [MyStruct] | semmle.label | a [MyStruct] |
240238
| main.rs:39:10:39:21 | a.get_data() | semmle.label | a.get_data() |
241239
| main.rs:46:9:46:14 | [post] &mut a [&ref, MyStruct] | semmle.label | [post] &mut a [&ref, MyStruct] |
@@ -459,7 +457,7 @@ nodes
459457
| main.rs:418:18:418:41 | ...::get_default(...) | semmle.label | ...::get_default(...) |
460458
| main.rs:419:14:419:15 | n5 | semmle.label | n5 |
461459
subpaths
462-
| 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] |
460+
| main.rs:38:16:38:24 | source(...) | main.rs:26:28:26:33 | ...: i64 | main.rs:26:17:26:25 | SelfParam [Return] [&ref, MyStruct] | main.rs:38:5:38:5 | [post] a [MyStruct] |
463461
| 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() |
464462
| 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] |
465463
| 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() |
@@ -482,7 +480,7 @@ subpaths
482480
testFailures
483481
#select
484482
| main.rs:18:10:18:10 | a | main.rs:13:5:13:13 | source(...) | main.rs:18:10:18:10 | a | $@ | main.rs:13:5:13:13 | source(...) | source(...) |
485-
| main.rs:39:10:39:21 | a.get_data() | main.rs:38:23:38:31 | source(...) | main.rs:39:10:39:21 | a.get_data() | $@ | main.rs:38:23:38:31 | source(...) | source(...) |
483+
| main.rs:39:10:39:21 | a.get_data() | main.rs:38:16:38:24 | source(...) | main.rs:39:10:39:21 | a.get_data() | $@ | main.rs:38:16:38:24 | source(...) | source(...) |
486484
| main.rs:49:10:49:21 | a.get_data() | main.rs:48:15:48:23 | source(...) | main.rs:49:10:49:21 | a.get_data() | $@ | main.rs:48:15:48:23 | source(...) | source(...) |
487485
| main.rs:53:10:53:10 | n | main.rs:57:13:57:21 | source(...) | main.rs:53:10:53:10 | n | $@ | main.rs:57:13:57:21 | source(...) | source(...) |
488486
| main.rs:68:10:68:10 | b | main.rs:66:13:66:21 | source(...) | main.rs:68:10:68:10 | b | $@ | main.rs:66:13:66:21 | source(...) | source(...) |

rust/ql/test/library-tests/dataflow/global/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ impl MyStruct {
3535
fn data_out_of_call_side_effect1() {
3636
let mut a = MyStruct { data: 0 };
3737
sink(a.get_data());
38-
(&mut a).set_data(source(8));
38+
a.set_data(source(8));
3939
sink(a.get_data()); // $ hasValueFlow=8
4040
}
4141

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
| main.rs:18:5:18:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
55
| main.rs:37:5:37:22 | sink(...) | main.rs:5:1:7:1 | fn sink |
66
| main.rs:37:10:37:21 | a.get_data() | main.rs:30:5:32:5 | fn get_data |
7-
| main.rs:38:5:38:32 | ... .set_data(...) | main.rs:26:5:28:5 | fn set_data |
8-
| main.rs:38:23:38:31 | source(...) | main.rs:1:1:3:1 | fn source |
7+
| main.rs:38:5:38:25 | a.set_data(...) | main.rs:26:5:28:5 | fn set_data |
8+
| main.rs:38:16:38:24 | source(...) | main.rs:1:1:3:1 | fn source |
99
| main.rs:39:5:39:22 | sink(...) | main.rs:5:1:7:1 | fn sink |
1010
| main.rs:39:10:39:21 | a.get_data() | main.rs:30:5:32:5 | fn get_data |
1111
| main.rs:44:5:48:24 | ... .set_data(...) | main.rs:26:5:28:5 | fn set_data |

0 commit comments

Comments
 (0)