Skip to content

Commit 42fe2d5

Browse files
hvitvedhvitved
committed
Rust: Add another type inference test
1 parent 33cc887 commit 42fe2d5

File tree

2 files changed

+71
-60
lines changed

2 files changed

+71
-60
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ mod implicit_deref {
228228
let x = 0i32;
229229
let v = Default::default(); // $ type=v:i32 target=default
230230
let s = S(v);
231+
let _ret = s(x); // $ type=_ret:bool
231232
let s_ref = &s;
232233
let _ret = s_ref(x); // $ type=_ret:bool
233234

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

Lines changed: 70 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -873,28 +873,31 @@ inferCertainType
873873
| closure.rs:218:13:218:22 | &... | | {EXTERNAL LOCATION} | & |
874874
| closure.rs:218:14:218:22 | \|...\| false | | {EXTERNAL LOCATION} | dyn Fn |
875875
| closure.rs:218:18:218:22 | false | | {EXTERNAL LOCATION} | bool |
876-
| closure.rs:222:19:240:5 | { ... } | | {EXTERNAL LOCATION} | () |
876+
| closure.rs:222:19:241:5 | { ... } | | {EXTERNAL LOCATION} | () |
877877
| closure.rs:223:13:223:13 | x | | {EXTERNAL LOCATION} | i64 |
878878
| closure.rs:223:17:223:20 | 0i64 | | {EXTERNAL LOCATION} | i64 |
879879
| closure.rs:226:21:226:23 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
880880
| closure.rs:226:21:226:23 | ArgList | T0 | {EXTERNAL LOCATION} | i64 |
881881
| closure.rs:226:22:226:22 | x | | {EXTERNAL LOCATION} | i64 |
882882
| closure.rs:228:13:228:13 | x | | {EXTERNAL LOCATION} | i32 |
883883
| closure.rs:228:17:228:20 | 0i32 | | {EXTERNAL LOCATION} | i32 |
884-
| closure.rs:231:13:231:17 | s_ref | | {EXTERNAL LOCATION} | & |
885-
| closure.rs:231:21:231:22 | &s | | {EXTERNAL LOCATION} | & |
886-
| closure.rs:232:20:232:24 | s_ref | | {EXTERNAL LOCATION} | & |
887-
| closure.rs:232:25:232:27 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
888-
| closure.rs:232:25:232:27 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
889-
| closure.rs:232:26:232:26 | x | | {EXTERNAL LOCATION} | i32 |
890-
| closure.rs:238:13:238:13 | c | | {EXTERNAL LOCATION} | dyn Fn |
891-
| closure.rs:238:17:238:21 | \|...\| x | | {EXTERNAL LOCATION} | dyn Fn |
892-
| closure.rs:239:9:239:12 | (...) | | {EXTERNAL LOCATION} | & |
893-
| closure.rs:239:10:239:11 | &c | | {EXTERNAL LOCATION} | & |
894-
| closure.rs:239:11:239:11 | c | | {EXTERNAL LOCATION} | dyn Fn |
895-
| closure.rs:239:13:239:15 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
896-
| closure.rs:239:13:239:15 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
897-
| closure.rs:239:14:239:14 | x | | {EXTERNAL LOCATION} | i32 |
884+
| closure.rs:231:21:231:23 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
885+
| closure.rs:231:21:231:23 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
886+
| closure.rs:231:22:231:22 | x | | {EXTERNAL LOCATION} | i32 |
887+
| closure.rs:232:13:232:17 | s_ref | | {EXTERNAL LOCATION} | & |
888+
| closure.rs:232:21:232:22 | &s | | {EXTERNAL LOCATION} | & |
889+
| closure.rs:233:20:233:24 | s_ref | | {EXTERNAL LOCATION} | & |
890+
| closure.rs:233:25:233:27 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
891+
| closure.rs:233:25:233:27 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
892+
| closure.rs:233:26:233:26 | x | | {EXTERNAL LOCATION} | i32 |
893+
| closure.rs:239:13:239:13 | c | | {EXTERNAL LOCATION} | dyn Fn |
894+
| closure.rs:239:17:239:21 | \|...\| x | | {EXTERNAL LOCATION} | dyn Fn |
895+
| closure.rs:240:9:240:12 | (...) | | {EXTERNAL LOCATION} | & |
896+
| closure.rs:240:10:240:11 | &c | | {EXTERNAL LOCATION} | & |
897+
| closure.rs:240:11:240:11 | c | | {EXTERNAL LOCATION} | dyn Fn |
898+
| closure.rs:240:13:240:15 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
899+
| closure.rs:240:13:240:15 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
900+
| closure.rs:240:14:240:14 | x | | {EXTERNAL LOCATION} | i32 |
898901
| dereference.rs:13:14:13:18 | SelfParam | | {EXTERNAL LOCATION} | & |
899902
| dereference.rs:13:14:13:18 | SelfParam | TRef | dereference.rs:5:1:7:1 | MyIntPointer |
900903
| dereference.rs:13:29:15:5 | { ... } | | {EXTERNAL LOCATION} | & |
@@ -6894,7 +6897,7 @@ inferType
68946897
| closure.rs:218:14:218:22 | \|...\| false | dyn(Output) | {EXTERNAL LOCATION} | bool |
68956898
| closure.rs:218:15:218:15 | _ | | closure.rs:214:10:214:10 | T |
68966899
| closure.rs:218:18:218:22 | false | | {EXTERNAL LOCATION} | bool |
6897-
| closure.rs:222:19:240:5 | { ... } | | {EXTERNAL LOCATION} | () |
6900+
| closure.rs:222:19:241:5 | { ... } | | {EXTERNAL LOCATION} | () |
68986901
| closure.rs:223:13:223:13 | x | | {EXTERNAL LOCATION} | i64 |
68996902
| closure.rs:223:17:223:20 | 0i64 | | {EXTERNAL LOCATION} | i64 |
69006903
| closure.rs:224:13:224:13 | v | | {EXTERNAL LOCATION} | i64 |
@@ -6920,50 +6923,57 @@ inferType
69206923
| closure.rs:230:17:230:20 | S(...) | | closure.rs:212:5:212:19 | S |
69216924
| closure.rs:230:17:230:20 | S(...) | T | {EXTERNAL LOCATION} | i32 |
69226925
| closure.rs:230:19:230:19 | v | | {EXTERNAL LOCATION} | i32 |
6923-
| closure.rs:231:13:231:17 | s_ref | | {EXTERNAL LOCATION} | & |
6924-
| closure.rs:231:13:231:17 | s_ref | TRef | closure.rs:212:5:212:19 | S |
6925-
| closure.rs:231:13:231:17 | s_ref | TRef.T | {EXTERNAL LOCATION} | i32 |
6926-
| closure.rs:231:21:231:22 | &s | | {EXTERNAL LOCATION} | & |
6927-
| closure.rs:231:21:231:22 | &s | TRef | closure.rs:212:5:212:19 | S |
6928-
| closure.rs:231:21:231:22 | &s | TRef.T | {EXTERNAL LOCATION} | i32 |
6929-
| closure.rs:231:22:231:22 | s | | closure.rs:212:5:212:19 | S |
6930-
| closure.rs:231:22:231:22 | s | T | {EXTERNAL LOCATION} | i32 |
6931-
| closure.rs:232:13:232:16 | _ret | | {EXTERNAL LOCATION} | bool |
6932-
| closure.rs:232:20:232:24 | s_ref | | {EXTERNAL LOCATION} | & |
6933-
| closure.rs:232:20:232:24 | s_ref | TRef | closure.rs:212:5:212:19 | S |
6934-
| closure.rs:232:20:232:24 | s_ref | TRef.T | {EXTERNAL LOCATION} | i32 |
6935-
| closure.rs:232:20:232:27 | s_ref(...) | | {EXTERNAL LOCATION} | bool |
6936-
| closure.rs:232:25:232:27 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
6937-
| closure.rs:232:25:232:27 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
6938-
| closure.rs:232:26:232:26 | x | | {EXTERNAL LOCATION} | i32 |
6939-
| closure.rs:238:13:238:13 | c | | {EXTERNAL LOCATION} | dyn Fn |
6940-
| closure.rs:238:13:238:13 | c | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
6941-
| closure.rs:238:13:238:13 | c | dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
6942-
| closure.rs:238:13:238:13 | c | dyn(Output) | {EXTERNAL LOCATION} | i32 |
6943-
| closure.rs:238:17:238:21 | \|...\| x | | {EXTERNAL LOCATION} | dyn Fn |
6944-
| closure.rs:238:17:238:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
6945-
| closure.rs:238:17:238:21 | \|...\| x | dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
6946-
| closure.rs:238:17:238:21 | \|...\| x | dyn(Output) | {EXTERNAL LOCATION} | i32 |
6947-
| closure.rs:238:18:238:18 | x | | {EXTERNAL LOCATION} | i32 |
6948-
| closure.rs:238:21:238:21 | x | | {EXTERNAL LOCATION} | i32 |
6949-
| closure.rs:239:9:239:12 | (...) | | {EXTERNAL LOCATION} | & |
6950-
| closure.rs:239:9:239:12 | (...) | TRef | {EXTERNAL LOCATION} | dyn Fn |
6951-
| closure.rs:239:9:239:12 | (...) | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
6952-
| closure.rs:239:9:239:12 | (...) | TRef.dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
6953-
| closure.rs:239:9:239:12 | (...) | TRef.dyn(Output) | {EXTERNAL LOCATION} | i32 |
6954-
| closure.rs:239:9:239:15 | ...(...) | | {EXTERNAL LOCATION} | i32 |
6955-
| closure.rs:239:10:239:11 | &c | | {EXTERNAL LOCATION} | & |
6956-
| closure.rs:239:10:239:11 | &c | TRef | {EXTERNAL LOCATION} | dyn Fn |
6957-
| closure.rs:239:10:239:11 | &c | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
6958-
| closure.rs:239:10:239:11 | &c | TRef.dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
6959-
| closure.rs:239:10:239:11 | &c | TRef.dyn(Output) | {EXTERNAL LOCATION} | i32 |
6960-
| closure.rs:239:11:239:11 | c | | {EXTERNAL LOCATION} | dyn Fn |
6961-
| closure.rs:239:11:239:11 | c | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
6962-
| closure.rs:239:11:239:11 | c | dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
6963-
| closure.rs:239:11:239:11 | c | dyn(Output) | {EXTERNAL LOCATION} | i32 |
6964-
| closure.rs:239:13:239:15 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
6965-
| closure.rs:239:13:239:15 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
6966-
| closure.rs:239:14:239:14 | x | | {EXTERNAL LOCATION} | i32 |
6926+
| closure.rs:231:13:231:16 | _ret | | {EXTERNAL LOCATION} | bool |
6927+
| closure.rs:231:20:231:20 | s | | closure.rs:212:5:212:19 | S |
6928+
| closure.rs:231:20:231:20 | s | T | {EXTERNAL LOCATION} | i32 |
6929+
| closure.rs:231:20:231:23 | s(...) | | {EXTERNAL LOCATION} | bool |
6930+
| closure.rs:231:21:231:23 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
6931+
| closure.rs:231:21:231:23 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
6932+
| closure.rs:231:22:231:22 | x | | {EXTERNAL LOCATION} | i32 |
6933+
| closure.rs:232:13:232:17 | s_ref | | {EXTERNAL LOCATION} | & |
6934+
| closure.rs:232:13:232:17 | s_ref | TRef | closure.rs:212:5:212:19 | S |
6935+
| closure.rs:232:13:232:17 | s_ref | TRef.T | {EXTERNAL LOCATION} | i32 |
6936+
| closure.rs:232:21:232:22 | &s | | {EXTERNAL LOCATION} | & |
6937+
| closure.rs:232:21:232:22 | &s | TRef | closure.rs:212:5:212:19 | S |
6938+
| closure.rs:232:21:232:22 | &s | TRef.T | {EXTERNAL LOCATION} | i32 |
6939+
| closure.rs:232:22:232:22 | s | | closure.rs:212:5:212:19 | S |
6940+
| closure.rs:232:22:232:22 | s | T | {EXTERNAL LOCATION} | i32 |
6941+
| closure.rs:233:13:233:16 | _ret | | {EXTERNAL LOCATION} | bool |
6942+
| closure.rs:233:20:233:24 | s_ref | | {EXTERNAL LOCATION} | & |
6943+
| closure.rs:233:20:233:24 | s_ref | TRef | closure.rs:212:5:212:19 | S |
6944+
| closure.rs:233:20:233:24 | s_ref | TRef.T | {EXTERNAL LOCATION} | i32 |
6945+
| closure.rs:233:20:233:27 | s_ref(...) | | {EXTERNAL LOCATION} | bool |
6946+
| closure.rs:233:25:233:27 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
6947+
| closure.rs:233:25:233:27 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
6948+
| closure.rs:233:26:233:26 | x | | {EXTERNAL LOCATION} | i32 |
6949+
| closure.rs:239:13:239:13 | c | | {EXTERNAL LOCATION} | dyn Fn |
6950+
| closure.rs:239:13:239:13 | c | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
6951+
| closure.rs:239:13:239:13 | c | dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
6952+
| closure.rs:239:13:239:13 | c | dyn(Output) | {EXTERNAL LOCATION} | i32 |
6953+
| closure.rs:239:17:239:21 | \|...\| x | | {EXTERNAL LOCATION} | dyn Fn |
6954+
| closure.rs:239:17:239:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
6955+
| closure.rs:239:17:239:21 | \|...\| x | dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
6956+
| closure.rs:239:17:239:21 | \|...\| x | dyn(Output) | {EXTERNAL LOCATION} | i32 |
6957+
| closure.rs:239:18:239:18 | x | | {EXTERNAL LOCATION} | i32 |
6958+
| closure.rs:239:21:239:21 | x | | {EXTERNAL LOCATION} | i32 |
6959+
| closure.rs:240:9:240:12 | (...) | | {EXTERNAL LOCATION} | & |
6960+
| closure.rs:240:9:240:12 | (...) | TRef | {EXTERNAL LOCATION} | dyn Fn |
6961+
| closure.rs:240:9:240:12 | (...) | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
6962+
| closure.rs:240:9:240:12 | (...) | TRef.dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
6963+
| closure.rs:240:9:240:12 | (...) | TRef.dyn(Output) | {EXTERNAL LOCATION} | i32 |
6964+
| closure.rs:240:9:240:15 | ...(...) | | {EXTERNAL LOCATION} | i32 |
6965+
| closure.rs:240:10:240:11 | &c | | {EXTERNAL LOCATION} | & |
6966+
| closure.rs:240:10:240:11 | &c | TRef | {EXTERNAL LOCATION} | dyn Fn |
6967+
| closure.rs:240:10:240:11 | &c | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
6968+
| closure.rs:240:10:240:11 | &c | TRef.dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
6969+
| closure.rs:240:10:240:11 | &c | TRef.dyn(Output) | {EXTERNAL LOCATION} | i32 |
6970+
| closure.rs:240:11:240:11 | c | | {EXTERNAL LOCATION} | dyn Fn |
6971+
| closure.rs:240:11:240:11 | c | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
6972+
| closure.rs:240:11:240:11 | c | dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
6973+
| closure.rs:240:11:240:11 | c | dyn(Output) | {EXTERNAL LOCATION} | i32 |
6974+
| closure.rs:240:13:240:15 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
6975+
| closure.rs:240:13:240:15 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
6976+
| closure.rs:240:14:240:14 | x | | {EXTERNAL LOCATION} | i32 |
69676977
| dereference.rs:13:14:13:18 | SelfParam | | {EXTERNAL LOCATION} | & |
69686978
| dereference.rs:13:14:13:18 | SelfParam | TRef | dereference.rs:5:1:7:1 | MyIntPointer |
69696979
| dereference.rs:13:29:15:5 | { ... } | | {EXTERNAL LOCATION} | & |

0 commit comments

Comments
 (0)