Skip to content

Rust: Replace recursion through forall with ranked recursion #21679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hvitved merged 3 commits into from
Apr 15, 2026
Merged

Rust: Replace recursion through forall with ranked recursion #21679

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42fe2d5
Rust: Add another type inference test
hvitved Apr 10, 2026
be329c8
Rust: Replace recursion through `forall` with ranked recursion
hvitved Apr 9, 2026
27f7f74
Rust: Check whole blanket constraints, not just the root trait type
hvitved Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Rust: Add another type inference test
  • Loading branch information
@hvitved
hvitved committed Apr 10, 2026
commit 42fe2d5002f5cad99ce5d92146fca9a23f723e39
1 change: 1 addition & 0 deletions rust/ql/test/library-tests/type-inference/closure.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ mod implicit_deref {
let x = 0i32;
let v = Default::default(); // $ type=v:i32 target=default
let s = S(v);
let _ret = s(x); // $ type=_ret:bool
let s_ref = &s;
let _ret = s_ref(x); // $ type=_ret:bool

Expand Down
130 changes: 70 additions & 60 deletions rust/ql/test/library-tests/type-inference/type-inference.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,28 +873,31 @@ inferCertainType
| closure.rs:218:13:218:22 | &... | | {EXTERNAL LOCATION} | & |
| closure.rs:218:14:218:22 | \|...\| false | | {EXTERNAL LOCATION} | dyn Fn |
| closure.rs:218:18:218:22 | false | | {EXTERNAL LOCATION} | bool |
| closure.rs:222:19:240:5 | { ... } | | {EXTERNAL LOCATION} | () |
| closure.rs:222:19:241:5 | { ... } | | {EXTERNAL LOCATION} | () |
| closure.rs:223:13:223:13 | x | | {EXTERNAL LOCATION} | i64 |
| closure.rs:223:17:223:20 | 0i64 | | {EXTERNAL LOCATION} | i64 |
| closure.rs:226:21:226:23 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
| closure.rs:226:21:226:23 | ArgList | T0 | {EXTERNAL LOCATION} | i64 |
| closure.rs:226:22:226:22 | x | | {EXTERNAL LOCATION} | i64 |
| closure.rs:228:13:228:13 | x | | {EXTERNAL LOCATION} | i32 |
| closure.rs:228:17:228:20 | 0i32 | | {EXTERNAL LOCATION} | i32 |
| closure.rs:231:13:231:17 | s_ref | | {EXTERNAL LOCATION} | & |
| closure.rs:231:21:231:22 | &s | | {EXTERNAL LOCATION} | & |
| closure.rs:232:20:232:24 | s_ref | | {EXTERNAL LOCATION} | & |
| closure.rs:232:25:232:27 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
| closure.rs:232:25:232:27 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
| closure.rs:232:26:232:26 | x | | {EXTERNAL LOCATION} | i32 |
| closure.rs:238:13:238:13 | c | | {EXTERNAL LOCATION} | dyn Fn |
| closure.rs:238:17:238:21 | \|...\| x | | {EXTERNAL LOCATION} | dyn Fn |
| closure.rs:239:9:239:12 | (...) | | {EXTERNAL LOCATION} | & |
| closure.rs:239:10:239:11 | &c | | {EXTERNAL LOCATION} | & |
| closure.rs:239:11:239:11 | c | | {EXTERNAL LOCATION} | dyn Fn |
| closure.rs:239:13:239:15 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
| closure.rs:239:13:239:15 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
| closure.rs:239:14:239:14 | x | | {EXTERNAL LOCATION} | i32 |
| closure.rs:231:21:231:23 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
| closure.rs:231:21:231:23 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
| closure.rs:231:22:231:22 | x | | {EXTERNAL LOCATION} | i32 |
| closure.rs:232:13:232:17 | s_ref | | {EXTERNAL LOCATION} | & |
| closure.rs:232:21:232:22 | &s | | {EXTERNAL LOCATION} | & |
| closure.rs:233:20:233:24 | s_ref | | {EXTERNAL LOCATION} | & |
| closure.rs:233:25:233:27 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
| closure.rs:233:25:233:27 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
| closure.rs:233:26:233:26 | x | | {EXTERNAL LOCATION} | i32 |
| closure.rs:239:13:239:13 | c | | {EXTERNAL LOCATION} | dyn Fn |
| closure.rs:239:17:239:21 | \|...\| x | | {EXTERNAL LOCATION} | dyn Fn |
| closure.rs:240:9:240:12 | (...) | | {EXTERNAL LOCATION} | & |
| closure.rs:240:10:240:11 | &c | | {EXTERNAL LOCATION} | & |
| closure.rs:240:11:240:11 | c | | {EXTERNAL LOCATION} | dyn Fn |
| closure.rs:240:13:240:15 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
| closure.rs:240:13:240:15 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
| closure.rs:240:14:240:14 | x | | {EXTERNAL LOCATION} | i32 |
| dereference.rs:13:14:13:18 | SelfParam | | {EXTERNAL LOCATION} | & |
| dereference.rs:13:14:13:18 | SelfParam | TRef | dereference.rs:5:1:7:1 | MyIntPointer |
| dereference.rs:13:29:15:5 | { ... } | | {EXTERNAL LOCATION} | & |
Expand Down Expand Up @@ -6894,7 +6897,7 @@ inferType
| closure.rs:218:14:218:22 | \|...\| false | dyn(Output) | {EXTERNAL LOCATION} | bool |
| closure.rs:218:15:218:15 | _ | | closure.rs:214:10:214:10 | T |
| closure.rs:218:18:218:22 | false | | {EXTERNAL LOCATION} | bool |
| closure.rs:222:19:240:5 | { ... } | | {EXTERNAL LOCATION} | () |
| closure.rs:222:19:241:5 | { ... } | | {EXTERNAL LOCATION} | () |
| closure.rs:223:13:223:13 | x | | {EXTERNAL LOCATION} | i64 |
| closure.rs:223:17:223:20 | 0i64 | | {EXTERNAL LOCATION} | i64 |
| closure.rs:224:13:224:13 | v | | {EXTERNAL LOCATION} | i64 |
Expand All @@ -6920,50 +6923,57 @@ inferType
| closure.rs:230:17:230:20 | S(...) | | closure.rs:212:5:212:19 | S |
| closure.rs:230:17:230:20 | S(...) | T | {EXTERNAL LOCATION} | i32 |
| closure.rs:230:19:230:19 | v | | {EXTERNAL LOCATION} | i32 |
| closure.rs:231:13:231:17 | s_ref | | {EXTERNAL LOCATION} | & |
| closure.rs:231:13:231:17 | s_ref | TRef | closure.rs:212:5:212:19 | S |
| closure.rs:231:13:231:17 | s_ref | TRef.T | {EXTERNAL LOCATION} | i32 |
| closure.rs:231:21:231:22 | &s | | {EXTERNAL LOCATION} | & |
| closure.rs:231:21:231:22 | &s | TRef | closure.rs:212:5:212:19 | S |
| closure.rs:231:21:231:22 | &s | TRef.T | {EXTERNAL LOCATION} | i32 |
| closure.rs:231:22:231:22 | s | | closure.rs:212:5:212:19 | S |
| closure.rs:231:22:231:22 | s | T | {EXTERNAL LOCATION} | i32 |
| closure.rs:232:13:232:16 | _ret | | {EXTERNAL LOCATION} | bool |
| closure.rs:232:20:232:24 | s_ref | | {EXTERNAL LOCATION} | & |
| closure.rs:232:20:232:24 | s_ref | TRef | closure.rs:212:5:212:19 | S |
| closure.rs:232:20:232:24 | s_ref | TRef.T | {EXTERNAL LOCATION} | i32 |
| closure.rs:232:20:232:27 | s_ref(...) | | {EXTERNAL LOCATION} | bool |
| closure.rs:232:25:232:27 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
| closure.rs:232:25:232:27 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
| closure.rs:232:26:232:26 | x | | {EXTERNAL LOCATION} | i32 |
| closure.rs:238:13:238:13 | c | | {EXTERNAL LOCATION} | dyn Fn |
| closure.rs:238:13:238:13 | c | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
| closure.rs:238:13:238:13 | c | dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
| closure.rs:238:13:238:13 | c | dyn(Output) | {EXTERNAL LOCATION} | i32 |
| closure.rs:238:17:238:21 | \|...\| x | | {EXTERNAL LOCATION} | dyn Fn |
| closure.rs:238:17:238:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
| closure.rs:238:17:238:21 | \|...\| x | dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
| closure.rs:238:17:238:21 | \|...\| x | dyn(Output) | {EXTERNAL LOCATION} | i32 |
| closure.rs:238:18:238:18 | x | | {EXTERNAL LOCATION} | i32 |
| closure.rs:238:21:238:21 | x | | {EXTERNAL LOCATION} | i32 |
| closure.rs:239:9:239:12 | (...) | | {EXTERNAL LOCATION} | & |
| closure.rs:239:9:239:12 | (...) | TRef | {EXTERNAL LOCATION} | dyn Fn |
| closure.rs:239:9:239:12 | (...) | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
| closure.rs:239:9:239:12 | (...) | TRef.dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
| closure.rs:239:9:239:12 | (...) | TRef.dyn(Output) | {EXTERNAL LOCATION} | i32 |
| closure.rs:239:9:239:15 | ...(...) | | {EXTERNAL LOCATION} | i32 |
| closure.rs:239:10:239:11 | &c | | {EXTERNAL LOCATION} | & |
| closure.rs:239:10:239:11 | &c | TRef | {EXTERNAL LOCATION} | dyn Fn |
| closure.rs:239:10:239:11 | &c | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
| closure.rs:239:10:239:11 | &c | TRef.dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
| closure.rs:239:10:239:11 | &c | TRef.dyn(Output) | {EXTERNAL LOCATION} | i32 |
| closure.rs:239:11:239:11 | c | | {EXTERNAL LOCATION} | dyn Fn |
| closure.rs:239:11:239:11 | c | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
| closure.rs:239:11:239:11 | c | dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
| closure.rs:239:11:239:11 | c | dyn(Output) | {EXTERNAL LOCATION} | i32 |
| closure.rs:239:13:239:15 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
| closure.rs:239:13:239:15 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
| closure.rs:239:14:239:14 | x | | {EXTERNAL LOCATION} | i32 |
| closure.rs:231:13:231:16 | _ret | | {EXTERNAL LOCATION} | bool |
| closure.rs:231:20:231:20 | s | | closure.rs:212:5:212:19 | S |
| closure.rs:231:20:231:20 | s | T | {EXTERNAL LOCATION} | i32 |
| closure.rs:231:20:231:23 | s(...) | | {EXTERNAL LOCATION} | bool |
| closure.rs:231:21:231:23 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
| closure.rs:231:21:231:23 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
| closure.rs:231:22:231:22 | x | | {EXTERNAL LOCATION} | i32 |
| closure.rs:232:13:232:17 | s_ref | | {EXTERNAL LOCATION} | & |
| closure.rs:232:13:232:17 | s_ref | TRef | closure.rs:212:5:212:19 | S |
| closure.rs:232:13:232:17 | s_ref | TRef.T | {EXTERNAL LOCATION} | i32 |
| closure.rs:232:21:232:22 | &s | | {EXTERNAL LOCATION} | & |
| closure.rs:232:21:232:22 | &s | TRef | closure.rs:212:5:212:19 | S |
| closure.rs:232:21:232:22 | &s | TRef.T | {EXTERNAL LOCATION} | i32 |
| closure.rs:232:22:232:22 | s | | closure.rs:212:5:212:19 | S |
| closure.rs:232:22:232:22 | s | T | {EXTERNAL LOCATION} | i32 |
| closure.rs:233:13:233:16 | _ret | | {EXTERNAL LOCATION} | bool |
| closure.rs:233:20:233:24 | s_ref | | {EXTERNAL LOCATION} | & |
| closure.rs:233:20:233:24 | s_ref | TRef | closure.rs:212:5:212:19 | S |
| closure.rs:233:20:233:24 | s_ref | TRef.T | {EXTERNAL LOCATION} | i32 |
| closure.rs:233:20:233:27 | s_ref(...) | | {EXTERNAL LOCATION} | bool |
| closure.rs:233:25:233:27 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
| closure.rs:233:25:233:27 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
| closure.rs:233:26:233:26 | x | | {EXTERNAL LOCATION} | i32 |
| closure.rs:239:13:239:13 | c | | {EXTERNAL LOCATION} | dyn Fn |
| closure.rs:239:13:239:13 | c | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
| closure.rs:239:13:239:13 | c | dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
| closure.rs:239:13:239:13 | c | dyn(Output) | {EXTERNAL LOCATION} | i32 |
| closure.rs:239:17:239:21 | \|...\| x | | {EXTERNAL LOCATION} | dyn Fn |
| closure.rs:239:17:239:21 | \|...\| x | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
| closure.rs:239:17:239:21 | \|...\| x | dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
| closure.rs:239:17:239:21 | \|...\| x | dyn(Output) | {EXTERNAL LOCATION} | i32 |
| closure.rs:239:18:239:18 | x | | {EXTERNAL LOCATION} | i32 |
| closure.rs:239:21:239:21 | x | | {EXTERNAL LOCATION} | i32 |
| closure.rs:240:9:240:12 | (...) | | {EXTERNAL LOCATION} | & |
| closure.rs:240:9:240:12 | (...) | TRef | {EXTERNAL LOCATION} | dyn Fn |
| closure.rs:240:9:240:12 | (...) | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
| closure.rs:240:9:240:12 | (...) | TRef.dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
| closure.rs:240:9:240:12 | (...) | TRef.dyn(Output) | {EXTERNAL LOCATION} | i32 |
| closure.rs:240:9:240:15 | ...(...) | | {EXTERNAL LOCATION} | i32 |
| closure.rs:240:10:240:11 | &c | | {EXTERNAL LOCATION} | & |
| closure.rs:240:10:240:11 | &c | TRef | {EXTERNAL LOCATION} | dyn Fn |
| closure.rs:240:10:240:11 | &c | TRef.dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
| closure.rs:240:10:240:11 | &c | TRef.dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
| closure.rs:240:10:240:11 | &c | TRef.dyn(Output) | {EXTERNAL LOCATION} | i32 |
| closure.rs:240:11:240:11 | c | | {EXTERNAL LOCATION} | dyn Fn |
| closure.rs:240:11:240:11 | c | dyn(Args) | {EXTERNAL LOCATION} | (T_1) |
| closure.rs:240:11:240:11 | c | dyn(Args).T0 | {EXTERNAL LOCATION} | i32 |
| closure.rs:240:11:240:11 | c | dyn(Output) | {EXTERNAL LOCATION} | i32 |
| closure.rs:240:13:240:15 | ArgList | | {EXTERNAL LOCATION} | (T_1) |
| closure.rs:240:13:240:15 | ArgList | T0 | {EXTERNAL LOCATION} | i32 |
| closure.rs:240:14:240:14 | x | | {EXTERNAL LOCATION} | i32 |
| dereference.rs:13:14:13:18 | SelfParam | | {EXTERNAL LOCATION} | & |
| dereference.rs:13:14:13:18 | SelfParam | TRef | dereference.rs:5:1:7:1 | MyIntPointer |
| dereference.rs:13:29:15:5 | { ... } | | {EXTERNAL LOCATION} | & |
Expand Down