Skip to content

Commit 3de780f

Browse files
hvitvedhvitved
committed
Rust: More type inference tests
1 parent d0b7388 commit 3de780f

File tree

3 files changed

+169
-40
lines changed

3 files changed

+169
-40
lines changed

‎rust/ql/test/library-tests/type-inference/CONSISTENCY/PathResolutionConsistency.expected‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
multipleCallTargets
2+
| blanket_impl.rs:257:18:257:27 | ... .m2() |
3+
| blanket_impl.rs:259:18:259:24 | S1.m4() |
24
| dereference.rs:69:15:69:24 | e1.deref() |
35
| dereference.rs:182:17:182:26 | ... .foo() |
46
| dereference.rs:183:17:183:23 | S.foo() |

‎rust/ql/test/library-tests/type-inference/blanket_impl.rs‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,85 @@ mod extension_trait_blanket_impl {
184184
}
185185
}
186186

187+
mod blanket_like_impl {
188+
#[derive(Debug, Copy, Clone)]
189+
struct S1;
190+
191+
#[derive(Debug, Copy, Clone)]
192+
struct S2;
193+
194+
trait MyTrait1 {
195+
// MyTrait1::m1
196+
fn m1(self);
197+
}
198+
199+
trait MyTrait2 {
200+
// MyTrait2::m2
201+
fn m2(self);
202+
}
203+
204+
trait MyTrait3 {
205+
// MyTrait3::m3
206+
fn m3(self);
207+
}
208+
209+
trait MyTrait4a {
210+
// MyTrait4a::m4
211+
fn m4(self);
212+
}
213+
214+
trait MyTrait4b {
215+
// MyTrait4b::m4
216+
fn m4(self);
217+
}
218+
219+
impl MyTrait1 for S1 {
220+
// S1::m1
221+
fn m1(self) {}
222+
}
223+
224+
impl MyTrait3 for S1 {
225+
// S1::m3
226+
fn m3(self) {}
227+
}
228+
229+
impl<T: MyTrait1 + Copy> MyTrait2 for &T {
230+
// MyTrait2Ref::m2
231+
fn m2(self) {
232+
self.m1() // $ target=MyTrait1::m1
233+
}
234+
}
235+
236+
impl MyTrait2 for &&S1 {
237+
// MyTrait2RefRefS1::m2
238+
fn m2(self) {
239+
self.m1() // $ MISSING: target=S1::m1
240+
}
241+
}
242+
243+
impl<T: MyTrait3> MyTrait4a for T {
244+
// MyTrait4aBlanket::m4
245+
fn m4(self) {
246+
self.m3() // $ target=MyTrait3::m3
247+
}
248+
}
249+
250+
impl<T> MyTrait4b for &T {
251+
// MyTrait4bRef::m4
252+
fn m4(self) {}
253+
}
254+
255+
pub fn test_basic_blanket() {
256+
let x1 = S1.m1(); // $ target=S1::m1
257+
let x2 = (&S1).m2(); // $ target=MyTrait2Ref::m2 $ SPURIOUS: target=MyTrait2RefRefS1::m2
258+
let x3 = (&&S1).m2(); // $ target=MyTrait2RefRefS1::m2
259+
let x4 = S1.m4(); // $ target=MyTrait4aBlanket::m4 $ SPURIOUS: target=MyTrait4bRef::m4
260+
let x5 = (&S1).m4(); // $ target=MyTrait4bRef::m4
261+
let x6 = S2.m4(); // $ target=MyTrait4bRef::m4
262+
let x7 = (&S2).m4(); // $ target=MyTrait4bRef::m4
263+
}
264+
}
265+
187266
pub mod sql_exec {
188267
// a highly simplified model of `MySqlConnection.execute` in SQLx
189268

‎rust/ql/test/library-tests/type-inference/type-inference.expected‎

Lines changed: 88 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -207,46 +207,94 @@ inferType
207207
| blanket_impl.rs:183:22:183:34 | my_other_flag | | blanket_impl.rs:160:5:162:5 | MyOtherFlag |
208208
| blanket_impl.rs:183:22:183:56 | my_other_flag.try_read_flag_twice() | | {EXTERNAL LOCATION} | Option |
209209
| blanket_impl.rs:183:22:183:56 | my_other_flag.try_read_flag_twice() | T | {EXTERNAL LOCATION} | bool |
210-
| blanket_impl.rs:193:21:193:25 | SelfParam | | file://:0:0:0:0 | & |
211-
| blanket_impl.rs:193:21:193:25 | SelfParam | &T | blanket_impl.rs:192:5:195:5 | Self [trait Executor] |
212-
| blanket_impl.rs:194:24:194:28 | SelfParam | | file://:0:0:0:0 | & |
213-
| blanket_impl.rs:194:24:194:28 | SelfParam | &T | blanket_impl.rs:192:5:195:5 | Self [trait Executor] |
214-
| blanket_impl.rs:194:31:194:35 | query | | blanket_impl.rs:194:21:194:21 | E |
215-
| blanket_impl.rs:198:21:198:25 | SelfParam | | file://:0:0:0:0 | & |
216-
| blanket_impl.rs:198:21:198:25 | SelfParam | &T | blanket_impl.rs:197:10:197:22 | T |
217-
| blanket_impl.rs:199:22:199:41 | "Executor::execute1\\n" | | file://:0:0:0:0 | & |
218-
| blanket_impl.rs:199:22:199:41 | "Executor::execute1\\n" | &T | {EXTERNAL LOCATION} | str |
219-
| blanket_impl.rs:199:22:199:41 | FormatArgsExpr | | {EXTERNAL LOCATION} | Arguments |
220-
| blanket_impl.rs:199:22:199:41 | MacroExpr | | {EXTERNAL LOCATION} | Arguments |
221-
| blanket_impl.rs:202:24:202:28 | SelfParam | | file://:0:0:0:0 | & |
222-
| blanket_impl.rs:202:24:202:28 | SelfParam | &T | blanket_impl.rs:197:10:197:22 | T |
223-
| blanket_impl.rs:202:31:202:36 | _query | | blanket_impl.rs:202:21:202:21 | E |
224-
| blanket_impl.rs:203:22:203:41 | "Executor::execute2\\n" | | file://:0:0:0:0 | & |
225-
| blanket_impl.rs:203:22:203:41 | "Executor::execute2\\n" | &T | {EXTERNAL LOCATION} | str |
226-
| blanket_impl.rs:203:22:203:41 | FormatArgsExpr | | {EXTERNAL LOCATION} | Arguments |
227-
| blanket_impl.rs:203:22:203:41 | MacroExpr | | {EXTERNAL LOCATION} | Arguments |
228-
| blanket_impl.rs:212:13:212:13 | c | | blanket_impl.rs:207:5:207:29 | MySqlConnection |
229-
| blanket_impl.rs:212:17:212:34 | MySqlConnection {...} | | blanket_impl.rs:207:5:207:29 | MySqlConnection |
230-
| blanket_impl.rs:214:9:214:9 | c | | blanket_impl.rs:207:5:207:29 | MySqlConnection |
231-
| blanket_impl.rs:215:35:215:36 | &c | | file://:0:0:0:0 | & |
232-
| blanket_impl.rs:215:35:215:36 | &c | &T | blanket_impl.rs:207:5:207:29 | MySqlConnection |
233-
| blanket_impl.rs:215:36:215:36 | c | | blanket_impl.rs:207:5:207:29 | MySqlConnection |
234-
| blanket_impl.rs:217:9:217:9 | c | | blanket_impl.rs:207:5:207:29 | MySqlConnection |
235-
| blanket_impl.rs:217:20:217:40 | "SELECT * FROM users" | | file://:0:0:0:0 | & |
236-
| blanket_impl.rs:217:20:217:40 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
237-
| blanket_impl.rs:218:9:218:9 | c | | blanket_impl.rs:207:5:207:29 | MySqlConnection |
238-
| blanket_impl.rs:218:28:218:48 | "SELECT * FROM users" | | file://:0:0:0:0 | & |
239-
| blanket_impl.rs:218:28:218:48 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
240-
| blanket_impl.rs:219:35:219:36 | &c | | file://:0:0:0:0 | & |
241-
| blanket_impl.rs:219:35:219:36 | &c | &T | blanket_impl.rs:207:5:207:29 | MySqlConnection |
242-
| blanket_impl.rs:219:36:219:36 | c | | blanket_impl.rs:207:5:207:29 | MySqlConnection |
243-
| blanket_impl.rs:219:39:219:59 | "SELECT * FROM users" | | file://:0:0:0:0 | & |
244-
| blanket_impl.rs:219:39:219:59 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
245-
| blanket_impl.rs:220:43:220:44 | &c | | file://:0:0:0:0 | & |
246-
| blanket_impl.rs:220:43:220:44 | &c | &T | blanket_impl.rs:207:5:207:29 | MySqlConnection |
247-
| blanket_impl.rs:220:44:220:44 | c | | blanket_impl.rs:207:5:207:29 | MySqlConnection |
248-
| blanket_impl.rs:220:47:220:67 | "SELECT * FROM users" | | file://:0:0:0:0 | & |
249-
| blanket_impl.rs:220:47:220:67 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
210+
| blanket_impl.rs:196:15:196:18 | SelfParam | | blanket_impl.rs:194:5:197:5 | Self [trait MyTrait1] |
211+
| blanket_impl.rs:201:15:201:18 | SelfParam | | blanket_impl.rs:199:5:202:5 | Self [trait MyTrait2] |
212+
| blanket_impl.rs:206:15:206:18 | SelfParam | | blanket_impl.rs:204:5:207:5 | Self [trait MyTrait3] |
213+
| blanket_impl.rs:211:15:211:18 | SelfParam | | blanket_impl.rs:209:5:212:5 | Self [trait MyTrait4a] |
214+
| blanket_impl.rs:216:15:216:18 | SelfParam | | blanket_impl.rs:214:5:217:5 | Self [trait MyTrait4b] |
215+
| blanket_impl.rs:221:15:221:18 | SelfParam | | blanket_impl.rs:188:5:189:14 | S1 |
216+
| blanket_impl.rs:226:15:226:18 | SelfParam | | blanket_impl.rs:188:5:189:14 | S1 |
217+
| blanket_impl.rs:231:15:231:18 | SelfParam | | file://:0:0:0:0 | & |
218+
| blanket_impl.rs:231:15:231:18 | SelfParam | &T | blanket_impl.rs:229:10:229:27 | T |
219+
| blanket_impl.rs:232:13:232:16 | self | | file://:0:0:0:0 | & |
220+
| blanket_impl.rs:232:13:232:16 | self | &T | blanket_impl.rs:229:10:229:27 | T |
221+
| blanket_impl.rs:238:15:238:18 | SelfParam | | file://:0:0:0:0 | & |
222+
| blanket_impl.rs:238:15:238:18 | SelfParam | &T | file://:0:0:0:0 | & |
223+
| blanket_impl.rs:238:15:238:18 | SelfParam | &T.&T | blanket_impl.rs:188:5:189:14 | S1 |
224+
| blanket_impl.rs:239:13:239:16 | self | | file://:0:0:0:0 | & |
225+
| blanket_impl.rs:239:13:239:16 | self | &T | file://:0:0:0:0 | & |
226+
| blanket_impl.rs:239:13:239:16 | self | &T.&T | blanket_impl.rs:188:5:189:14 | S1 |
227+
| blanket_impl.rs:245:15:245:18 | SelfParam | | blanket_impl.rs:243:10:243:20 | T |
228+
| blanket_impl.rs:246:13:246:16 | self | | blanket_impl.rs:243:10:243:20 | T |
229+
| blanket_impl.rs:252:15:252:18 | SelfParam | | file://:0:0:0:0 | & |
230+
| blanket_impl.rs:252:15:252:18 | SelfParam | &T | blanket_impl.rs:250:10:250:10 | T |
231+
| blanket_impl.rs:256:18:256:19 | S1 | | blanket_impl.rs:188:5:189:14 | S1 |
232+
| blanket_impl.rs:257:18:257:22 | (...) | | file://:0:0:0:0 | & |
233+
| blanket_impl.rs:257:18:257:22 | (...) | &T | blanket_impl.rs:188:5:189:14 | S1 |
234+
| blanket_impl.rs:257:19:257:21 | &S1 | | file://:0:0:0:0 | & |
235+
| blanket_impl.rs:257:19:257:21 | &S1 | &T | blanket_impl.rs:188:5:189:14 | S1 |
236+
| blanket_impl.rs:257:20:257:21 | S1 | | blanket_impl.rs:188:5:189:14 | S1 |
237+
| blanket_impl.rs:258:18:258:23 | (...) | | file://:0:0:0:0 | & |
238+
| blanket_impl.rs:258:18:258:23 | (...) | &T | file://:0:0:0:0 | & |
239+
| blanket_impl.rs:258:18:258:23 | (...) | &T.&T | blanket_impl.rs:188:5:189:14 | S1 |
240+
| blanket_impl.rs:258:19:258:22 | &... | | file://:0:0:0:0 | & |
241+
| blanket_impl.rs:258:19:258:22 | &... | &T | file://:0:0:0:0 | & |
242+
| blanket_impl.rs:258:19:258:22 | &... | &T.&T | blanket_impl.rs:188:5:189:14 | S1 |
243+
| blanket_impl.rs:258:20:258:22 | &S1 | | file://:0:0:0:0 | & |
244+
| blanket_impl.rs:258:20:258:22 | &S1 | &T | blanket_impl.rs:188:5:189:14 | S1 |
245+
| blanket_impl.rs:258:21:258:22 | S1 | | blanket_impl.rs:188:5:189:14 | S1 |
246+
| blanket_impl.rs:259:18:259:19 | S1 | | blanket_impl.rs:188:5:189:14 | S1 |
247+
| blanket_impl.rs:260:18:260:22 | (...) | | file://:0:0:0:0 | & |
248+
| blanket_impl.rs:260:18:260:22 | (...) | &T | blanket_impl.rs:188:5:189:14 | S1 |
249+
| blanket_impl.rs:260:19:260:21 | &S1 | | file://:0:0:0:0 | & |
250+
| blanket_impl.rs:260:19:260:21 | &S1 | &T | blanket_impl.rs:188:5:189:14 | S1 |
251+
| blanket_impl.rs:260:20:260:21 | S1 | | blanket_impl.rs:188:5:189:14 | S1 |
252+
| blanket_impl.rs:261:18:261:19 | S2 | | blanket_impl.rs:191:5:192:14 | S2 |
253+
| blanket_impl.rs:262:18:262:22 | (...) | | file://:0:0:0:0 | & |
254+
| blanket_impl.rs:262:18:262:22 | (...) | &T | blanket_impl.rs:191:5:192:14 | S2 |
255+
| blanket_impl.rs:262:19:262:21 | &S2 | | file://:0:0:0:0 | & |
256+
| blanket_impl.rs:262:19:262:21 | &S2 | &T | blanket_impl.rs:191:5:192:14 | S2 |
257+
| blanket_impl.rs:262:20:262:21 | S2 | | blanket_impl.rs:191:5:192:14 | S2 |
258+
| blanket_impl.rs:272:21:272:25 | SelfParam | | file://:0:0:0:0 | & |
259+
| blanket_impl.rs:272:21:272:25 | SelfParam | &T | blanket_impl.rs:271:5:274:5 | Self [trait Executor] |
260+
| blanket_impl.rs:273:24:273:28 | SelfParam | | file://:0:0:0:0 | & |
261+
| blanket_impl.rs:273:24:273:28 | SelfParam | &T | blanket_impl.rs:271:5:274:5 | Self [trait Executor] |
262+
| blanket_impl.rs:273:31:273:35 | query | | blanket_impl.rs:273:21:273:21 | E |
263+
| blanket_impl.rs:277:21:277:25 | SelfParam | | file://:0:0:0:0 | & |
264+
| blanket_impl.rs:277:21:277:25 | SelfParam | &T | blanket_impl.rs:276:10:276:22 | T |
265+
| blanket_impl.rs:278:22:278:41 | "Executor::execute1\\n" | | file://:0:0:0:0 | & |
266+
| blanket_impl.rs:278:22:278:41 | "Executor::execute1\\n" | &T | {EXTERNAL LOCATION} | str |
267+
| blanket_impl.rs:278:22:278:41 | FormatArgsExpr | | {EXTERNAL LOCATION} | Arguments |
268+
| blanket_impl.rs:278:22:278:41 | MacroExpr | | {EXTERNAL LOCATION} | Arguments |
269+
| blanket_impl.rs:281:24:281:28 | SelfParam | | file://:0:0:0:0 | & |
270+
| blanket_impl.rs:281:24:281:28 | SelfParam | &T | blanket_impl.rs:276:10:276:22 | T |
271+
| blanket_impl.rs:281:31:281:36 | _query | | blanket_impl.rs:281:21:281:21 | E |
272+
| blanket_impl.rs:282:22:282:41 | "Executor::execute2\\n" | | file://:0:0:0:0 | & |
273+
| blanket_impl.rs:282:22:282:41 | "Executor::execute2\\n" | &T | {EXTERNAL LOCATION} | str |
274+
| blanket_impl.rs:282:22:282:41 | FormatArgsExpr | | {EXTERNAL LOCATION} | Arguments |
275+
| blanket_impl.rs:282:22:282:41 | MacroExpr | | {EXTERNAL LOCATION} | Arguments |
276+
| blanket_impl.rs:291:13:291:13 | c | | blanket_impl.rs:286:5:286:29 | MySqlConnection |
277+
| blanket_impl.rs:291:17:291:34 | MySqlConnection {...} | | blanket_impl.rs:286:5:286:29 | MySqlConnection |
278+
| blanket_impl.rs:293:9:293:9 | c | | blanket_impl.rs:286:5:286:29 | MySqlConnection |
279+
| blanket_impl.rs:294:35:294:36 | &c | | file://:0:0:0:0 | & |
280+
| blanket_impl.rs:294:35:294:36 | &c | &T | blanket_impl.rs:286:5:286:29 | MySqlConnection |
281+
| blanket_impl.rs:294:36:294:36 | c | | blanket_impl.rs:286:5:286:29 | MySqlConnection |
282+
| blanket_impl.rs:296:9:296:9 | c | | blanket_impl.rs:286:5:286:29 | MySqlConnection |
283+
| blanket_impl.rs:296:20:296:40 | "SELECT * FROM users" | | file://:0:0:0:0 | & |
284+
| blanket_impl.rs:296:20:296:40 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
285+
| blanket_impl.rs:297:9:297:9 | c | | blanket_impl.rs:286:5:286:29 | MySqlConnection |
286+
| blanket_impl.rs:297:28:297:48 | "SELECT * FROM users" | | file://:0:0:0:0 | & |
287+
| blanket_impl.rs:297:28:297:48 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
288+
| blanket_impl.rs:298:35:298:36 | &c | | file://:0:0:0:0 | & |
289+
| blanket_impl.rs:298:35:298:36 | &c | &T | blanket_impl.rs:286:5:286:29 | MySqlConnection |
290+
| blanket_impl.rs:298:36:298:36 | c | | blanket_impl.rs:286:5:286:29 | MySqlConnection |
291+
| blanket_impl.rs:298:39:298:59 | "SELECT * FROM users" | | file://:0:0:0:0 | & |
292+
| blanket_impl.rs:298:39:298:59 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
293+
| blanket_impl.rs:299:43:299:44 | &c | | file://:0:0:0:0 | & |
294+
| blanket_impl.rs:299:43:299:44 | &c | &T | blanket_impl.rs:286:5:286:29 | MySqlConnection |
295+
| blanket_impl.rs:299:44:299:44 | c | | blanket_impl.rs:286:5:286:29 | MySqlConnection |
296+
| blanket_impl.rs:299:47:299:67 | "SELECT * FROM users" | | file://:0:0:0:0 | & |
297+
| blanket_impl.rs:299:47:299:67 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
250298
| closure.rs:6:13:6:22 | my_closure | | {EXTERNAL LOCATION} | dyn FnOnce |
251299
| closure.rs:6:13:6:22 | my_closure | dyn(Args) | file://:0:0:0:0 | (T_2) |
252300
| closure.rs:6:13:6:22 | my_closure | dyn(Args).0(2) | {EXTERNAL LOCATION} | bool |

0 commit comments

Comments
 (0)