Skip to content

Commit 1225c5c

Browse files
paldepindpaldepind
committed
Rust: Accept changes
1 parent d8d8829 commit 1225c5c

File tree

2 files changed

+12
-116
lines changed

2 files changed

+12
-116
lines changed

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

Lines changed: 10 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -7,129 +7,33 @@ models
77
| 6 | Summary: lang:core; crate::ptr::read; Argument[0].Reference; ReturnValue; value |
88
| 7 | Summary: lang:core; crate::ptr::write; Argument[1]; Argument[0].Reference; value |
99
edges
10-
<<<<<<< HEAD
11-
| main.rs:13:9:13:9 | a [Some] | main.rs:14:10:14:19 | a.unwrap(...) | provenance | MaD:2 |
12-
| main.rs:13:9:13:9 | a [Some] | main.rs:15:13:15:21 | a.clone(...) [Some] | provenance | MaD:1 |
13-
| main.rs:13:9:13:9 | a [Some] | main.rs:15:13:15:21 | a.clone(...) [Some] | provenance | generated |
14-
| main.rs:13:13:13:28 | Some(...) [Some] | main.rs:13:9:13:9 | a [Some] | provenance | |
15-
| main.rs:13:18:13:27 | source(...) | main.rs:13:13:13:28 | Some(...) [Some] | provenance | |
16-
| main.rs:15:9:15:9 | b [Some] | main.rs:16:10:16:19 | b.unwrap(...) | provenance | MaD:2 |
17-
| main.rs:15:13:15:21 | a.clone(...) [Some] | main.rs:15:9:15:9 | b [Some] | provenance | |
18-
| main.rs:20:9:20:9 | a [Ok] | main.rs:21:10:21:19 | a.unwrap(...) | provenance | MaD:5 |
19-
| main.rs:20:9:20:9 | a [Ok] | main.rs:22:13:22:21 | a.clone(...) [Ok] | provenance | MaD:4 |
20-
| main.rs:20:9:20:9 | a [Ok] | main.rs:22:13:22:21 | a.clone(...) [Ok] | provenance | generated |
21-
| main.rs:20:31:20:44 | Ok(...) [Ok] | main.rs:20:9:20:9 | a [Ok] | provenance | |
22-
| main.rs:20:34:20:43 | source(...) | main.rs:20:31:20:44 | Ok(...) [Ok] | provenance | |
23-
| main.rs:22:9:22:9 | b [Ok] | main.rs:23:10:23:19 | b.unwrap(...) | provenance | MaD:5 |
24-
| main.rs:22:13:22:21 | a.clone(...) [Ok] | main.rs:22:9:22:9 | b [Ok] | provenance | |
25-
| main.rs:27:9:27:9 | a | main.rs:28:10:28:10 | a | provenance | |
26-
| main.rs:27:9:27:9 | a | main.rs:29:13:29:21 | a.clone(...) | provenance | generated |
27-
| main.rs:27:13:27:22 | source(...) | main.rs:27:9:27:9 | a | provenance | |
28-
| main.rs:29:9:29:9 | b | main.rs:30:10:30:10 | b | provenance | |
29-
| main.rs:29:13:29:21 | a.clone(...) | main.rs:29:9:29:9 | b | provenance | |
30-
| main.rs:42:13:42:13 | w [Wrapper] | main.rs:43:15:43:15 | w [Wrapper] | provenance | |
31-
| main.rs:42:17:42:41 | Wrapper {...} [Wrapper] | main.rs:42:13:42:13 | w [Wrapper] | provenance | |
32-
| main.rs:42:30:42:39 | source(...) | main.rs:42:17:42:41 | Wrapper {...} [Wrapper] | provenance | |
33-
| main.rs:43:15:43:15 | w [Wrapper] | main.rs:44:13:44:28 | Wrapper {...} [Wrapper] | provenance | |
34-
| main.rs:43:15:43:15 | w [Wrapper] | main.rs:46:17:46:25 | w.clone(...) [Wrapper] | provenance | generated |
35-
| main.rs:44:13:44:28 | Wrapper {...} [Wrapper] | main.rs:44:26:44:26 | n | provenance | |
36-
| main.rs:44:26:44:26 | n | main.rs:44:38:44:38 | n | provenance | |
37-
| main.rs:46:13:46:13 | u [Wrapper] | main.rs:47:15:47:15 | u [Wrapper] | provenance | |
38-
| main.rs:46:17:46:25 | w.clone(...) [Wrapper] | main.rs:46:13:46:13 | u [Wrapper] | provenance | |
39-
| main.rs:47:15:47:15 | u [Wrapper] | main.rs:48:13:48:28 | Wrapper {...} [Wrapper] | provenance | |
40-
| main.rs:48:13:48:28 | Wrapper {...} [Wrapper] | main.rs:48:26:48:26 | n | provenance | |
41-
| main.rs:48:26:48:26 | n | main.rs:48:38:48:38 | n | provenance | |
42-
| main.rs:59:13:59:13 | b [Some] | main.rs:60:23:60:23 | b [Some] | provenance | |
43-
| main.rs:59:17:59:32 | Some(...) [Some] | main.rs:59:13:59:13 | b [Some] | provenance | |
44-
| main.rs:59:22:59:31 | source(...) | main.rs:59:17:59:32 | Some(...) [Some] | provenance | |
45-
| main.rs:60:13:60:13 | z [Some, tuple.1] | main.rs:61:15:61:15 | z [Some, tuple.1] | provenance | |
46-
| main.rs:60:17:60:24 | a.zip(...) [Some, tuple.1] | main.rs:60:13:60:13 | z [Some, tuple.1] | provenance | |
47-
| main.rs:60:23:60:23 | b [Some] | main.rs:60:17:60:24 | a.zip(...) [Some, tuple.1] | provenance | MaD:3 |
48-
| main.rs:61:15:61:15 | z [Some, tuple.1] | main.rs:62:13:62:24 | Some(...) [Some, tuple.1] | provenance | |
49-
| main.rs:62:13:62:24 | Some(...) [Some, tuple.1] | main.rs:62:18:62:23 | TuplePat [tuple.1] | provenance | |
50-
| main.rs:62:18:62:23 | TuplePat [tuple.1] | main.rs:62:22:62:22 | m | provenance | |
51-
| main.rs:62:22:62:22 | m | main.rs:64:22:64:22 | m | provenance | |
52-
nodes
53-
| main.rs:13:9:13:9 | a [Some] | semmle.label | a [Some] |
54-
| main.rs:13:13:13:28 | Some(...) [Some] | semmle.label | Some(...) [Some] |
55-
| main.rs:13:18:13:27 | source(...) | semmle.label | source(...) |
56-
| main.rs:14:10:14:19 | a.unwrap(...) | semmle.label | a.unwrap(...) |
57-
| main.rs:15:9:15:9 | b [Some] | semmle.label | b [Some] |
58-
| main.rs:15:13:15:21 | a.clone(...) [Some] | semmle.label | a.clone(...) [Some] |
59-
| main.rs:16:10:16:19 | b.unwrap(...) | semmle.label | b.unwrap(...) |
60-
| main.rs:20:9:20:9 | a [Ok] | semmle.label | a [Ok] |
61-
| main.rs:20:31:20:44 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
62-
| main.rs:20:34:20:43 | source(...) | semmle.label | source(...) |
63-
| main.rs:21:10:21:19 | a.unwrap(...) | semmle.label | a.unwrap(...) |
64-
| main.rs:22:9:22:9 | b [Ok] | semmle.label | b [Ok] |
65-
| main.rs:22:13:22:21 | a.clone(...) [Ok] | semmle.label | a.clone(...) [Ok] |
66-
| main.rs:23:10:23:19 | b.unwrap(...) | semmle.label | b.unwrap(...) |
67-
| main.rs:27:9:27:9 | a | semmle.label | a |
68-
| main.rs:27:13:27:22 | source(...) | semmle.label | source(...) |
69-
| main.rs:28:10:28:10 | a | semmle.label | a |
70-
| main.rs:29:9:29:9 | b | semmle.label | b |
71-
| main.rs:29:13:29:21 | a.clone(...) | semmle.label | a.clone(...) |
72-
| main.rs:30:10:30:10 | b | semmle.label | b |
73-
| main.rs:42:13:42:13 | w [Wrapper] | semmle.label | w [Wrapper] |
74-
| main.rs:42:17:42:41 | Wrapper {...} [Wrapper] | semmle.label | Wrapper {...} [Wrapper] |
75-
| main.rs:42:30:42:39 | source(...) | semmle.label | source(...) |
76-
| main.rs:43:15:43:15 | w [Wrapper] | semmle.label | w [Wrapper] |
77-
| main.rs:44:13:44:28 | Wrapper {...} [Wrapper] | semmle.label | Wrapper {...} [Wrapper] |
78-
| main.rs:44:26:44:26 | n | semmle.label | n |
79-
| main.rs:44:38:44:38 | n | semmle.label | n |
80-
| main.rs:46:13:46:13 | u [Wrapper] | semmle.label | u [Wrapper] |
81-
| main.rs:46:17:46:25 | w.clone(...) [Wrapper] | semmle.label | w.clone(...) [Wrapper] |
82-
| main.rs:47:15:47:15 | u [Wrapper] | semmle.label | u [Wrapper] |
83-
| main.rs:48:13:48:28 | Wrapper {...} [Wrapper] | semmle.label | Wrapper {...} [Wrapper] |
84-
| main.rs:48:26:48:26 | n | semmle.label | n |
85-
| main.rs:48:38:48:38 | n | semmle.label | n |
86-
| main.rs:59:13:59:13 | b [Some] | semmle.label | b [Some] |
87-
| main.rs:59:17:59:32 | Some(...) [Some] | semmle.label | Some(...) [Some] |
88-
| main.rs:59:22:59:31 | source(...) | semmle.label | source(...) |
89-
| main.rs:60:13:60:13 | z [Some, tuple.1] | semmle.label | z [Some, tuple.1] |
90-
| main.rs:60:17:60:24 | a.zip(...) [Some, tuple.1] | semmle.label | a.zip(...) [Some, tuple.1] |
91-
| main.rs:60:23:60:23 | b [Some] | semmle.label | b [Some] |
92-
| main.rs:61:15:61:15 | z [Some, tuple.1] | semmle.label | z [Some, tuple.1] |
93-
| main.rs:62:13:62:24 | Some(...) [Some, tuple.1] | semmle.label | Some(...) [Some, tuple.1] |
94-
| main.rs:62:18:62:23 | TuplePat [tuple.1] | semmle.label | TuplePat [tuple.1] |
95-
| main.rs:62:22:62:22 | m | semmle.label | m |
96-
| main.rs:64:22:64:22 | m | semmle.label | m |
97-
=======
98-
| main.rs:12:9:12:9 | a [Some] | main.rs:13:10:13:10 | a [Some] | provenance | |
99-
| main.rs:12:9:12:9 | a [Some] | main.rs:14:13:14:13 | a [Some] | provenance | |
10+
| main.rs:12:9:12:9 | a [Some] | main.rs:13:10:13:19 | a.unwrap(...) | provenance | MaD:2 |
11+
| main.rs:12:9:12:9 | a [Some] | main.rs:14:13:14:21 | a.clone(...) [Some] | provenance | MaD:1 |
12+
| main.rs:12:9:12:9 | a [Some] | main.rs:14:13:14:21 | a.clone(...) [Some] | provenance | generated |
10013
| main.rs:12:13:12:28 | Some(...) [Some] | main.rs:12:9:12:9 | a [Some] | provenance | |
10114
| main.rs:12:18:12:27 | source(...) | main.rs:12:13:12:28 | Some(...) [Some] | provenance | |
102-
| main.rs:13:10:13:10 | a [Some] | main.rs:13:10:13:19 | a.unwrap(...) | provenance | MaD:2 |
103-
| main.rs:14:9:14:9 | b [Some] | main.rs:15:10:15:10 | b [Some] | provenance | |
104-
| main.rs:14:13:14:13 | a [Some] | main.rs:14:13:14:21 | a.clone(...) [Some] | provenance | MaD:1 |
105-
| main.rs:14:13:14:13 | a [Some] | main.rs:14:13:14:21 | a.clone(...) [Some] | provenance | generated |
15+
| main.rs:14:9:14:9 | b [Some] | main.rs:15:10:15:19 | b.unwrap(...) | provenance | MaD:2 |
10616
| main.rs:14:13:14:21 | a.clone(...) [Some] | main.rs:14:9:14:9 | b [Some] | provenance | |
107-
| main.rs:15:10:15:10 | b [Some] | main.rs:15:10:15:19 | b.unwrap(...) | provenance | MaD:2 |
108-
| main.rs:19:9:19:9 | a [Ok] | main.rs:20:10:20:10 | a [Ok] | provenance | |
109-
| main.rs:19:9:19:9 | a [Ok] | main.rs:21:13:21:13 | a [Ok] | provenance | |
17+
| main.rs:19:9:19:9 | a [Ok] | main.rs:20:10:20:19 | a.unwrap(...) | provenance | MaD:5 |
18+
| main.rs:19:9:19:9 | a [Ok] | main.rs:21:13:21:21 | a.clone(...) [Ok] | provenance | MaD:4 |
19+
| main.rs:19:9:19:9 | a [Ok] | main.rs:21:13:21:21 | a.clone(...) [Ok] | provenance | generated |
11020
| main.rs:19:31:19:44 | Ok(...) [Ok] | main.rs:19:9:19:9 | a [Ok] | provenance | |
11121
| main.rs:19:34:19:43 | source(...) | main.rs:19:31:19:44 | Ok(...) [Ok] | provenance | |
112-
| main.rs:20:10:20:10 | a [Ok] | main.rs:20:10:20:19 | a.unwrap(...) | provenance | MaD:5 |
113-
| main.rs:21:9:21:9 | b [Ok] | main.rs:22:10:22:10 | b [Ok] | provenance | |
114-
| main.rs:21:13:21:13 | a [Ok] | main.rs:21:13:21:21 | a.clone(...) [Ok] | provenance | MaD:4 |
115-
| main.rs:21:13:21:13 | a [Ok] | main.rs:21:13:21:21 | a.clone(...) [Ok] | provenance | generated |
22+
| main.rs:21:9:21:9 | b [Ok] | main.rs:22:10:22:19 | b.unwrap(...) | provenance | MaD:5 |
11623
| main.rs:21:13:21:21 | a.clone(...) [Ok] | main.rs:21:9:21:9 | b [Ok] | provenance | |
117-
| main.rs:22:10:22:10 | b [Ok] | main.rs:22:10:22:19 | b.unwrap(...) | provenance | MaD:5 |
11824
| main.rs:26:9:26:9 | a | main.rs:27:10:27:10 | a | provenance | |
119-
| main.rs:26:9:26:9 | a | main.rs:28:13:28:13 | a | provenance | |
25+
| main.rs:26:9:26:9 | a | main.rs:28:13:28:21 | a.clone(...) | provenance | generated |
12026
| main.rs:26:13:26:22 | source(...) | main.rs:26:9:26:9 | a | provenance | |
12127
| main.rs:28:9:28:9 | b | main.rs:29:10:29:10 | b | provenance | |
122-
| main.rs:28:13:28:13 | a | main.rs:28:13:28:21 | a.clone(...) | provenance | generated |
12328
| main.rs:28:13:28:21 | a.clone(...) | main.rs:28:9:28:9 | b | provenance | |
12429
| main.rs:41:13:41:13 | w [Wrapper] | main.rs:42:15:42:15 | w [Wrapper] | provenance | |
12530
| main.rs:41:17:41:41 | Wrapper {...} [Wrapper] | main.rs:41:13:41:13 | w [Wrapper] | provenance | |
12631
| main.rs:41:30:41:39 | source(...) | main.rs:41:17:41:41 | Wrapper {...} [Wrapper] | provenance | |
12732
| main.rs:42:15:42:15 | w [Wrapper] | main.rs:43:13:43:28 | Wrapper {...} [Wrapper] | provenance | |
128-
| main.rs:42:15:42:15 | w [Wrapper] | main.rs:45:17:45:17 | w [Wrapper] | provenance | |
33+
| main.rs:42:15:42:15 | w [Wrapper] | main.rs:45:17:45:25 | w.clone(...) [Wrapper] | provenance | generated |
12934
| main.rs:43:13:43:28 | Wrapper {...} [Wrapper] | main.rs:43:26:43:26 | n | provenance | |
13035
| main.rs:43:26:43:26 | n | main.rs:43:38:43:38 | n | provenance | |
13136
| main.rs:45:13:45:13 | u [Wrapper] | main.rs:46:15:46:15 | u [Wrapper] | provenance | |
132-
| main.rs:45:17:45:17 | w [Wrapper] | main.rs:45:17:45:25 | w.clone(...) [Wrapper] | provenance | generated |
13337
| main.rs:45:17:45:25 | w.clone(...) [Wrapper] | main.rs:45:13:45:13 | u [Wrapper] | provenance | |
13438
| main.rs:46:15:46:15 | u [Wrapper] | main.rs:47:13:47:28 | Wrapper {...} [Wrapper] | provenance | |
13539
| main.rs:47:13:47:28 | Wrapper {...} [Wrapper] | main.rs:47:26:47:26 | n | provenance | |
@@ -151,28 +55,21 @@ nodes
15155
| main.rs:12:9:12:9 | a [Some] | semmle.label | a [Some] |
15256
| main.rs:12:13:12:28 | Some(...) [Some] | semmle.label | Some(...) [Some] |
15357
| main.rs:12:18:12:27 | source(...) | semmle.label | source(...) |
154-
| main.rs:13:10:13:10 | a [Some] | semmle.label | a [Some] |
15558
| main.rs:13:10:13:19 | a.unwrap(...) | semmle.label | a.unwrap(...) |
15659
| main.rs:14:9:14:9 | b [Some] | semmle.label | b [Some] |
157-
| main.rs:14:13:14:13 | a [Some] | semmle.label | a [Some] |
15860
| main.rs:14:13:14:21 | a.clone(...) [Some] | semmle.label | a.clone(...) [Some] |
159-
| main.rs:15:10:15:10 | b [Some] | semmle.label | b [Some] |
16061
| main.rs:15:10:15:19 | b.unwrap(...) | semmle.label | b.unwrap(...) |
16162
| main.rs:19:9:19:9 | a [Ok] | semmle.label | a [Ok] |
16263
| main.rs:19:31:19:44 | Ok(...) [Ok] | semmle.label | Ok(...) [Ok] |
16364
| main.rs:19:34:19:43 | source(...) | semmle.label | source(...) |
164-
| main.rs:20:10:20:10 | a [Ok] | semmle.label | a [Ok] |
16565
| main.rs:20:10:20:19 | a.unwrap(...) | semmle.label | a.unwrap(...) |
16666
| main.rs:21:9:21:9 | b [Ok] | semmle.label | b [Ok] |
167-
| main.rs:21:13:21:13 | a [Ok] | semmle.label | a [Ok] |
16867
| main.rs:21:13:21:21 | a.clone(...) [Ok] | semmle.label | a.clone(...) [Ok] |
169-
| main.rs:22:10:22:10 | b [Ok] | semmle.label | b [Ok] |
17068
| main.rs:22:10:22:19 | b.unwrap(...) | semmle.label | b.unwrap(...) |
17169
| main.rs:26:9:26:9 | a | semmle.label | a |
17270
| main.rs:26:13:26:22 | source(...) | semmle.label | source(...) |
17371
| main.rs:27:10:27:10 | a | semmle.label | a |
17472
| main.rs:28:9:28:9 | b | semmle.label | b |
175-
| main.rs:28:13:28:13 | a | semmle.label | a |
17673
| main.rs:28:13:28:21 | a.clone(...) | semmle.label | a.clone(...) |
17774
| main.rs:29:10:29:10 | b | semmle.label | b |
17875
| main.rs:41:13:41:13 | w [Wrapper] | semmle.label | w [Wrapper] |
@@ -183,7 +80,6 @@ nodes
18380
| main.rs:43:26:43:26 | n | semmle.label | n |
18481
| main.rs:43:38:43:38 | n | semmle.label | n |
18582
| main.rs:45:13:45:13 | u [Wrapper] | semmle.label | u [Wrapper] |
186-
| main.rs:45:17:45:17 | w [Wrapper] | semmle.label | w [Wrapper] |
18783
| main.rs:45:17:45:25 | w.clone(...) [Wrapper] | semmle.label | w.clone(...) [Wrapper] |
18884
| main.rs:46:15:46:15 | u [Wrapper] | semmle.label | u [Wrapper] |
18985
| main.rs:47:13:47:28 | Wrapper {...} [Wrapper] | semmle.label | Wrapper {...} [Wrapper] |
@@ -204,7 +100,6 @@ nodes
204100
| main.rs:84:32:84:41 | source(...) | semmle.label | source(...) |
205101
| main.rs:85:18:85:34 | ...::read(...) | semmle.label | ...::read(...) |
206102
| main.rs:85:33:85:33 | y [&ref] | semmle.label | y [&ref] |
207-
>>>>>>> main
208103
subpaths
209104
testFailures
210105
#select

‎rust/ql/test/utils-tests/modelgenerator/CaptureSummaryModels.expected‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ unexpectedModel
77
| Unexpected summary found: repo::test;<crate::option::MyOption>::get_or_insert_default;Argument[self].Field[crate::option::MyOption::MySome(0)];ReturnValue.Reference;value;dfc-generated |
88
| Unexpected summary found: repo::test;<crate::option::MyOption>::get_or_insert_with;Argument[self].Field[crate::option::MyOption::MySome(0)];ReturnValue.Reference;value;dfc-generated |
99
| Unexpected summary found: repo::test;<crate::option::MyOption>::insert;Argument[self].Field[crate::option::MyOption::MySome(0)];ReturnValue.Reference;value;dfc-generated |
10-
| Unexpected summary found: repo::test;<crate::option::MyOption>::take_if;Argument[self].Field[crate::option::MyOption::MySome(0)];Argument[0].Parameter[0].Reference;value;dfc-generated |
1110
expectedModel
11+
| Expected summary missing: repo::test;<crate::option::MyOption>::take_if;Argument[self].Reference.Field[crate::option::MyOption::MySome(0)];Argument[0].Parameter[0].Reference;value;dfc-generated |
12+
| Expected summary missing: repo::test;<crate::option::MyOption>::take_if;Argument[self].Reference;ReturnValue;value;dfc-generated |

0 commit comments

Comments
 (0)