Skip to content

Rust: Handle functions as data flow lambdas #20547

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
merged 3 commits into from
Oct 6, 2025
Merged

Rust: Handle functions as data flow lambdas #20547

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
0728692
Rust: Add tests for functions as lambdas
paldepind Sep 29, 2025
37ffe82
Rust: Handle functions as lambdas
paldepind Sep 29, 2025
98a20f9
Rust: Add change note
paldepind Sep 29, 2025
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
50 changes: 0 additions & 50 deletions rust/ql/test/library-tests/dataflow/closures/inline-flow.expected
View file
Open in desktop

This file was deleted.

0 ...ibrary-tests/dataflow/closures/Cargo.lock → ...library-tests/dataflow/lambdas/Cargo.lock
View file
Open in desktop
File renamed without changes.
50 changes: 50 additions & 0 deletions rust/ql/test/library-tests/dataflow/lambdas/inline-flow.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
models
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you change the dir name to lambdas? I thought closure was more standard terminology in Rust.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before the tests only covered closures. Now they also covers functions, which are not closures. So I though that "closure" wasn't wide enough, and that using the data flow library terminology was the best match for what's common across the tests.

edges
| main.rs:10:20:10:52 | if cond {...} else {...} | main.rs:11:10:11:16 | f(...) | provenance | |
| main.rs:10:30:10:39 | source(...) | main.rs:10:20:10:52 | if cond {...} else {...} | provenance | |
| main.rs:15:20:15:23 | ... | main.rs:17:18:17:21 | data | provenance | |
| main.rs:22:9:22:9 | a | main.rs:23:13:23:13 | a | provenance | |
| main.rs:22:13:22:22 | source(...) | main.rs:22:9:22:9 | a | provenance | |
| main.rs:23:13:23:13 | a | main.rs:15:20:15:23 | ... | provenance | |
| main.rs:27:20:27:23 | ... | main.rs:27:26:27:52 | if cond {...} else {...} | provenance | |
| main.rs:28:9:28:9 | a | main.rs:29:21:29:21 | a | provenance | |
| main.rs:28:13:28:22 | source(...) | main.rs:28:9:28:9 | a | provenance | |
| main.rs:29:9:29:9 | b | main.rs:30:10:30:10 | b | provenance | |
| main.rs:29:13:29:22 | f(...) | main.rs:29:9:29:9 | b | provenance | |
| main.rs:29:21:29:21 | a | main.rs:27:20:27:23 | ... | provenance | |
| main.rs:29:21:29:21 | a | main.rs:29:13:29:22 | f(...) | provenance | |
| main.rs:37:16:37:25 | source(...) | main.rs:39:5:39:5 | [post] f [captured capt] | provenance | |
| main.rs:39:5:39:5 | [post] f [captured capt] | main.rs:40:10:40:13 | capt | provenance | |
| main.rs:39:5:39:5 | [post] f [captured capt] | main.rs:44:5:44:5 | g [captured capt] | provenance | |
| main.rs:44:5:44:5 | g [captured capt] | main.rs:42:14:42:17 | capt | provenance | |
nodes
| main.rs:10:20:10:52 | if cond {...} else {...} | semmle.label | if cond {...} else {...} |
| main.rs:10:30:10:39 | source(...) | semmle.label | source(...) |
| main.rs:11:10:11:16 | f(...) | semmle.label | f(...) |
| main.rs:15:20:15:23 | ... | semmle.label | ... |
| main.rs:17:18:17:21 | data | semmle.label | data |
| main.rs:22:9:22:9 | a | semmle.label | a |
| main.rs:22:13:22:22 | source(...) | semmle.label | source(...) |
| main.rs:23:13:23:13 | a | semmle.label | a |
| main.rs:27:20:27:23 | ... | semmle.label | ... |
| main.rs:27:26:27:52 | if cond {...} else {...} | semmle.label | if cond {...} else {...} |
| main.rs:28:9:28:9 | a | semmle.label | a |
| main.rs:28:13:28:22 | source(...) | semmle.label | source(...) |
| main.rs:29:9:29:9 | b | semmle.label | b |
| main.rs:29:13:29:22 | f(...) | semmle.label | f(...) |
| main.rs:29:21:29:21 | a | semmle.label | a |
| main.rs:30:10:30:10 | b | semmle.label | b |
| main.rs:37:16:37:25 | source(...) | semmle.label | source(...) |
| main.rs:39:5:39:5 | [post] f [captured capt] | semmle.label | [post] f [captured capt] |
| main.rs:40:10:40:13 | capt | semmle.label | capt |
| main.rs:42:14:42:17 | capt | semmle.label | capt |
| main.rs:44:5:44:5 | g [captured capt] | semmle.label | g [captured capt] |
subpaths
| main.rs:29:21:29:21 | a | main.rs:27:20:27:23 | ... | main.rs:27:26:27:52 | if cond {...} else {...} | main.rs:29:13:29:22 | f(...) |
testFailures
#select
| main.rs:11:10:11:16 | f(...) | main.rs:10:30:10:39 | source(...) | main.rs:11:10:11:16 | f(...) | $@ | main.rs:10:30:10:39 | source(...) | source(...) |
| main.rs:17:18:17:21 | data | main.rs:22:13:22:22 | source(...) | main.rs:17:18:17:21 | data | $@ | main.rs:22:13:22:22 | source(...) | source(...) |
| main.rs:30:10:30:10 | b | main.rs:28:13:28:22 | source(...) | main.rs:30:10:30:10 | b | $@ | main.rs:28:13:28:22 | source(...) | source(...) |
| main.rs:40:10:40:13 | capt | main.rs:37:16:37:25 | source(...) | main.rs:40:10:40:13 | capt | $@ | main.rs:37:16:37:25 | source(...) | source(...) |
| main.rs:42:14:42:17 | capt | main.rs:37:16:37:25 | source(...) | main.rs:42:14:42:17 | capt | $@ | main.rs:37:16:37:25 | source(...) | source(...) |
0 ...ry-tests/dataflow/closures/inline-flow.ql → ...ary-tests/dataflow/lambdas/inline-flow.ql
View file
Open in desktop
File renamed without changes.
50 changes: 41 additions & 9 deletions ...t/library-tests/dataflow/closures/main.rs → ...st/library-tests/dataflow/lambdas/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,25 @@ fn sink(s: i64) {
println!("{}", s);
}


fn closure_flow_out() {
let f = |cond| if cond { source(92) } else { 0 };
sink(f(true)); // $ hasValueFlow=92
}

fn closure_flow_in() {
let f = |cond, data|
let f = |cond, data| {
if cond {
sink(data); // $ hasValueFlow=87
} else {
sink(0)
};
}
};
Comment on lines +15 to +21
Copy link

Copilot AI Sep 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] The closure formatting is inconsistent with the rest of the file. Consider using the same single-line format as closure_flow_through() for consistency, or apply consistent multi-line formatting throughout.

Suggested change
let f = |cond, data| {
if cond {
sink(data); // $ hasValueFlow=87
} else {
sink(0)
};
}
};
let f = |cond, data| sink(if cond { data } else { 0 }); // $ hasValueFlow=87

Copilot uses AI. Check for mistakes.
Comment on lines +15 to +21
Copy link

Copilot AI Sep 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] The closure formatting is inconsistent with the rest of the file. Consider using the same single-line format as closure_flow_through() for consistency, or apply consistent multi-line formatting throughout.

Suggested change
let f = |cond, data| {
if cond {
sink(data); // $ hasValueFlow=87
} else {
sink(0)
};
}
};
let f = |cond, data| if cond { sink(data); /* $ hasValueFlow=87 */ } else { sink(0) };

Copilot uses AI. Check for mistakes.
let a = source(87);
f(true, a);
}

fn closure_flow_through() {
let f = |cond, data|
if cond {
data
} else {
0
};
let f = |cond, data| if cond { data } else { 0 };
let a = source(43);
let b = f(true, a);
sink(b); // $ hasValueFlow=43
Expand All @@ -49,9 +44,46 @@ fn closure_captured_variable() {
g();
}

fn get_from_source() -> i64 {
source(93)
}

fn pass_to_sink(data: i64) {
sink(data); // $ MISSING: hasValueFlow=34
}

fn function_flow_out() {
let f = get_from_source;
sink(f()); // $ MISSING: hasValueFlow=93
}

fn function_flow_in() {
let f = pass_to_sink;
let a = source(34);
f(a);
}

fn get_arg(cond: bool, data: i64) -> i64 {
if cond {
data
} else {
0
}
}

fn function_flows_through() {
let f = get_arg;
let a = source(56);
let b = f(true, a);
sink(b); // $ MISSING: hasValueFlow=56
}

fn main() {
closure_flow_out();
closure_flow_in();
closure_flow_through();
closure_captured_variable();
function_flow_in();
function_flow_out();
function_flows_through();
}