Skip to content

Commit 353d630

Browse files
committed
Rust: accept test changes
1 parent 0370291 commit 353d630

File tree

5 files changed

+34
-56
lines changed

5 files changed

+34
-56
lines changed

rust/ql/test/extractor-tests/crate_graph/crates.expected

Lines changed: 29 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
#-----| Crate([email protected])
22
#-----| core -> Crate([email protected])
33
#-----| compiler_builtins -> Crate([email protected])
4-
#-----| rand -> Crate([email protected].0)
4+
#-----| rand -> Crate([email protected].1)
55
#-----| rand_xorshift -> Crate([email protected])
66

7-
#-----| Crate([email protected])
8-
97
#-----| Crate([email protected])
108
#-----| proc_macro -> Crate([email protected])
119
#-----| alloc -> Crate([email protected])
@@ -14,17 +12,16 @@
1412
#-----| test -> Crate([email protected])
1513
#-----| generic_array -> Crate([email protected])
1614

17-
#-----| Crate([email protected])
18-
#-----| core -> Crate([email protected])
19-
#-----| compiler_builtins -> Crate([email protected])
20-
2115
#-----| Crate([email protected])
2216
#-----| proc_macro -> Crate([email protected])
2317
#-----| alloc -> Crate([email protected])
2418
#-----| core -> Crate([email protected])
2519
#-----| std -> Crate([email protected])
2620
#-----| test -> Crate([email protected])
2721

22+
#-----| Crate([email protected])
23+
#-----| core -> Crate([email protected])
24+
2825
#-----| Crate([email protected])
2926
#-----| core -> Crate([email protected])
3027

@@ -56,18 +53,16 @@
5653
#-----| test -> Crate([email protected])
5754
#-----| typenum -> Crate([email protected])
5855

59-
#-----| Crate([email protected].21)
56+
#-----| Crate([email protected].23)
6057
#-----| core -> Crate([email protected])
6158
#-----| std -> Crate([email protected])
62-
#-----| unicode_width -> Crate(unicode_width@0.1.14)
59+
#-----| unicode_width -> Crate(unicode_width@0.2.1)
6360

64-
#-----| Crate([email protected])
65-
#-----| allocator_api2 -> Crate([email protected])
61+
#-----| Crate([email protected])
6662
#-----| alloc -> Crate([email protected])
6763
#-----| core -> Crate([email protected])
68-
#-----| compiler_builtins -> Crate([email protected])
6964

70-
#-----| Crate([email protected].169)
65+
#-----| Crate([email protected].174)
7166
#-----| rustc_std_workspace_core -> Crate([email protected])
7267

7368
main.rs:
@@ -100,46 +95,43 @@ main.rs:
10095
#-----| Crate([email protected])
10196
#-----| alloc -> Crate([email protected])
10297
#-----| core -> Crate([email protected])
98+
#-----| cfg_if -> Crate([email protected])
10399
#-----| compiler_builtins -> Crate([email protected])
104-
#-----| cfg_if -> Crate([email protected])
105-
#-----| libc -> Crate([email protected])
100+
#-----| libc -> Crate([email protected])
106101

107102
#-----| Crate([email protected])
108103
#-----| alloc -> Crate([email protected])
109104
#-----| core -> Crate([email protected])
105+
#-----| cfg_if -> Crate([email protected])
110106
#-----| compiler_builtins -> Crate([email protected])
111-
#-----| cfg_if -> Crate([email protected])
112-
#-----| libc -> Crate([email protected])
107+
#-----| libc -> Crate([email protected])
113108
#-----| unwind -> Crate([email protected])
114109

115110
#-----| Crate([email protected])
116111
#-----| core -> Crate([email protected])
117112
#-----| std -> Crate([email protected])
118113

119-
#-----| Crate([email protected])
120-
#-----| zerocopy -> Crate([email protected])
121-
#-----| rand_core -> Crate([email protected])
114+
#-----| Crate([email protected])
115+
#-----| rand_core -> Crate([email protected])
122116

123-
#-----| Crate([email protected])
124-
#-----| zerocopy -> Crate([email protected])
117+
#-----| Crate([email protected])
125118

126119
#-----| Crate([email protected])
127-
#-----| rand_core -> Crate([email protected].0)
120+
#-----| rand_core -> Crate([email protected].3)
128121

129-
#-----| Crate([email protected].24)
122+
#-----| Crate([email protected].25)
130123
#-----| core -> Crate([email protected])
131-
#-----| compiler_builtins -> Crate([email protected])
132124

133125
#-----| Crate([email protected])
134126
#-----| alloc -> Crate([email protected])
135127
#-----| core -> Crate([email protected])
128+
#-----| cfg_if -> Crate([email protected])
136129
#-----| compiler_builtins -> Crate([email protected])
137-
#-----| cfg_if -> Crate([email protected])
138-
#-----| hashbrown -> Crate([email protected])
139-
#-----| libc -> Crate([email protected])
140-
#-----| rand -> Crate([email protected])
130+
#-----| hashbrown -> Crate([email protected])
131+
#-----| libc -> Crate([email protected])
132+
#-----| rand -> Crate([email protected])
141133
#-----| rand_xorshift -> Crate([email protected])
142-
#-----| rustc_demangle -> Crate([email protected].24)
134+
#-----| rustc_demangle -> Crate([email protected].25)
143135
#-----| panic_abort -> Crate([email protected])
144136
#-----| unwind -> Crate([email protected])
145137
#-----| panic_unwind -> Crate([email protected])
@@ -148,15 +140,15 @@ main.rs:
148140
#-----| Crate([email protected])
149141
#-----| alloc -> Crate([email protected])
150142
#-----| core -> Crate([email protected])
143+
#-----| cfg_if -> Crate([email protected])
151144
#-----| compiler_builtins -> Crate([email protected])
152-
#-----| cfg_if -> Crate([email protected])
153-
#-----| libc -> Crate([email protected])
145+
#-----| libc -> Crate([email protected])
154146

155147
#-----| Crate([email protected])
156148
#-----| core -> Crate([email protected])
157149
#-----| std -> Crate([email protected])
158-
#-----| getopts -> Crate([email protected].21)
159-
#-----| libc -> Crate([email protected].169)
150+
#-----| getopts -> Crate([email protected].23)
151+
#-----| libc -> Crate([email protected].174)
160152

161153
lib.rs:
162154
# 0| Crate([email protected])
@@ -175,22 +167,19 @@ lib.rs:
175167
#-----| std -> Crate([email protected])
176168
#-----| test -> Crate([email protected])
177169

178-
#-----| Crate(unicode_width@0.1.14)
170+
#-----| Crate(unicode_width@0.2.1)
179171
#-----| core -> Crate([email protected])
180172
#-----| std -> Crate([email protected])
181-
#-----| compiler_builtins -> Crate([email protected])
182173

183174
#-----| Crate([email protected])
184175
#-----| core -> Crate([email protected])
176+
#-----| cfg_if -> Crate([email protected])
185177
#-----| compiler_builtins -> Crate([email protected])
186-
#-----| cfg_if -> Crate([email protected])
187-
#-----| libc -> Crate([email protected])
178+
#-----| libc -> Crate([email protected])
188179

189180
#-----| Crate([email protected])
190181
#-----| proc_macro -> Crate([email protected])
191182
#-----| alloc -> Crate([email protected])
192183
#-----| core -> Crate([email protected])
193184
#-----| std -> Crate([email protected])
194185
#-----| test -> Crate([email protected])
195-
196-
#-----| Crate([email protected])

rust/ql/test/library-tests/path-resolution/path-resolution.expected

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -392,15 +392,15 @@ resolvePath
392392
| proc_macro.rs:5:25:5:35 | TokenStream | {EXTERNAL LOCATION} | struct TokenStream |
393393
| proc_macro.rs:5:44:5:54 | TokenStream | {EXTERNAL LOCATION} | struct TokenStream |
394394
| proc_macro.rs:5:60:5:70 | TokenStream | {EXTERNAL LOCATION} | struct TokenStream |
395-
| proc_macro.rs:6:16:6:18 | syn | {EXTERNAL LOCATION} | Crate([email protected].103) |
396-
| proc_macro.rs:6:48:6:50 | syn | {EXTERNAL LOCATION} | Crate([email protected].103) |
395+
| proc_macro.rs:6:16:6:18 | syn | {EXTERNAL LOCATION} | Crate([email protected].104) |
396+
| proc_macro.rs:6:48:6:50 | syn | {EXTERNAL LOCATION} | Crate([email protected].104) |
397397
| proc_macro.rs:6:48:6:58 | ...::LitStr | {EXTERNAL LOCATION} | struct LitStr |
398398
| proc_macro.rs:6:48:6:58 | ...::parse::<...> | {EXTERNAL LOCATION} | fn parse |
399-
| proc_macro.rs:7:19:7:21 | syn | {EXTERNAL LOCATION} | Crate([email protected].103) |
400-
| proc_macro.rs:7:51:7:53 | syn | {EXTERNAL LOCATION} | Crate([email protected].103) |
399+
| proc_macro.rs:7:19:7:21 | syn | {EXTERNAL LOCATION} | Crate([email protected].104) |
400+
| proc_macro.rs:7:51:7:53 | syn | {EXTERNAL LOCATION} | Crate([email protected].104) |
401401
| proc_macro.rs:7:51:7:61 | ...::ItemFn | {EXTERNAL LOCATION} | struct ItemFn |
402402
| proc_macro.rs:7:51:7:61 | ...::parse::<...> | {EXTERNAL LOCATION} | fn parse |
403-
| proc_macro.rs:8:21:8:23 | syn | {EXTERNAL LOCATION} | Crate([email protected].103) |
403+
| proc_macro.rs:8:21:8:23 | syn | {EXTERNAL LOCATION} | Crate([email protected].104) |
404404
| proc_macro.rs:8:21:8:30 | ...::Ident | {EXTERNAL LOCATION} | struct Ident |
405405
| proc_macro.rs:8:21:8:35 | ...::new | {EXTERNAL LOCATION} | fn new |
406406
testFailures
Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
multipleCallTargets
22
| main.rs:85:19:85:40 | ...::from(...) |
33
| main.rs:102:19:102:40 | ...::from(...) |
4-
| main.rs:374:5:374:27 | ... .add_assign(...) |
5-
| main.rs:459:9:459:23 | z.add_assign(...) |

rust/ql/test/query-tests/security/CWE-770/CONSISTENCY/PathResolutionConsistency.expected

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
multipleCallTargets
2-
| main.rs:218:14:218:30 | ...::malloc(...) |
3-
| main.rs:219:13:219:27 | ...::malloc(...) |
4-
| main.rs:220:13:220:37 | ...::aligned_alloc(...) |
5-
| main.rs:221:13:221:37 | ...::aligned_alloc(...) |
6-
| main.rs:222:13:222:31 | ...::calloc(...) |
7-
| main.rs:223:13:223:55 | ...::calloc(...) |
8-
| main.rs:224:13:224:32 | ...::realloc(...) |
92
| main.rs:229:13:229:40 | ...::with_capacity(...) |
103
| main.rs:233:18:233:47 | ...::with_capacity(...) |
114
multiplePathResolutions

rust/ql/test/query-tests/security/CWE-825/CONSISTENCY/PathResolutionConsistency.expected

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
multipleCallTargets
2-
| deallocation.rs:106:16:106:32 | ...::malloc(...) |
3-
| deallocation.rs:112:3:112:41 | ...::free(...) |
42
| deallocation.rs:260:11:260:29 | ...::from(...) |
53
| deallocation.rs:261:11:261:29 | ...::from(...) |
64
| lifetime.rs:610:13:610:31 | ...::from(...) |

0 commit comments

Comments
 (0)