Skip to content

Commit 3a63dbc

Browse files
hvitvedpaldepind
andcommitted
Apply suggestions from code review
Co-authored-by: Simon Friis Vindum <[email protected]>
1 parent 025a673 commit 3a63dbc

File tree

2 files changed

+19
-18
lines changed

2 files changed

+19
-18
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ struct MyInt {
100100
impl Add for MyInt {
101101
type Output = MyInt;
102102

103-
fn add(self, other: MyInt) -> MyInt {
103+
fn add(self, _other: MyInt) -> MyInt {
104+
// Ignore `_other` to get value flow for `self.value`
104105
MyInt { value: self.value }
105106
}
106107
}
@@ -111,9 +112,9 @@ pub fn test_operator_overloading() {
111112
let c = a + b;
112113
sink(c.value); // $ MISSING: hasValueFlow=5
113114

114-
let a = MyInt { value: source(6) };
115-
let b = MyInt { value: 2 };
116-
let d = b + a;
115+
let a = MyInt { value: 2 };
116+
let b = MyInt { value: source(6) };
117+
let d = a + b;
117118
sink(d.value);
118119

119120
let a = MyInt { value: source(7) };

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
| main.rs:89:13:89:21 | source(...) | main.rs:1:1:3:1 | fn source |
2020
| main.rs:90:13:90:30 | mn.data_through(...) | main.rs:66:5:72:5 | fn data_through |
2121
| main.rs:91:5:91:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
22-
| main.rs:109:28:109:36 | source(...) | main.rs:1:1:3:1 | fn source |
23-
| main.rs:112:5:112:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
24-
| main.rs:114:28:114:36 | source(...) | main.rs:1:1:3:1 | fn source |
25-
| main.rs:117:5:117:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
26-
| main.rs:119:28:119:36 | source(...) | main.rs:1:1:3:1 | fn source |
27-
| main.rs:121:13:121:20 | a.add(...) | main.rs:103:5:105:5 | fn add |
28-
| main.rs:122:5:122:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
29-
| main.rs:126:5:126:22 | data_out_of_call(...) | main.rs:16:1:19:1 | fn data_out_of_call |
30-
| main.rs:127:5:127:21 | data_in_to_call(...) | main.rs:25:1:28:1 | fn data_in_to_call |
31-
| main.rs:128:5:128:23 | data_through_call(...) | main.rs:34:1:38:1 | fn data_through_call |
32-
| main.rs:130:5:130:24 | data_out_of_method(...) | main.rs:75:1:79:1 | fn data_out_of_method |
33-
| main.rs:131:5:131:28 | data_in_to_method_call(...) | main.rs:81:1:85:1 | fn data_in_to_method_call |
34-
| main.rs:132:5:132:25 | data_through_method(...) | main.rs:87:1:92:1 | fn data_through_method |
35-
| main.rs:134:5:134:31 | test_operator_overloading(...) | main.rs:108:1:123:1 | fn test_operator_overloading |
22+
| main.rs:110:28:110:36 | source(...) | main.rs:1:1:3:1 | fn source |
23+
| main.rs:113:5:113:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
24+
| main.rs:116:28:116:36 | source(...) | main.rs:1:1:3:1 | fn source |
25+
| main.rs:118:5:118:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
26+
| main.rs:120:28:120:36 | source(...) | main.rs:1:1:3:1 | fn source |
27+
| main.rs:122:13:122:20 | a.add(...) | main.rs:103:5:106:5 | fn add |
28+
| main.rs:123:5:123:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
29+
| main.rs:127:5:127:22 | data_out_of_call(...) | main.rs:16:1:19:1 | fn data_out_of_call |
30+
| main.rs:128:5:128:21 | data_in_to_call(...) | main.rs:25:1:28:1 | fn data_in_to_call |
31+
| main.rs:129:5:129:23 | data_through_call(...) | main.rs:34:1:38:1 | fn data_through_call |
32+
| main.rs:131:5:131:24 | data_out_of_method(...) | main.rs:75:1:79:1 | fn data_out_of_method |
33+
| main.rs:132:5:132:28 | data_in_to_method_call(...) | main.rs:81:1:85:1 | fn data_in_to_method_call |
34+
| main.rs:133:5:133:25 | data_through_method(...) | main.rs:87:1:92:1 | fn data_through_method |
35+
| main.rs:135:5:135:31 | test_operator_overloading(...) | main.rs:109:1:124:1 | fn test_operator_overloading |

0 commit comments

Comments
 (0)