Skip to content

Rust: Add models for core::cmp::Ord::{min,max,clamp} #21035

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 1 commit into from
Dec 15, 2025
+666 −555
Merged

Rust: Add models for core::cmp::Ord::{min,max,clamp} #21035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions rust/ql/lib/codeql/rust/frameworks/stdlib/core.model.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,10 @@ extensions:
- ["<core::str>::parse", "Argument[self]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
- ["<core::str>::trim", "Argument[self]", "ReturnValue.Reference", "taint", "manual"]
- ["<core::str>::to_string", "Argument[self]", "ReturnValue", "taint", "manual"]
# Ord
- ["<_ as core::cmp::Ord>::min", "Argument[self,0]", "ReturnValue", "value", "manual"]
- ["<_ as core::cmp::Ord>::max", "Argument[self,0]", "ReturnValue", "value", "manual"]
- ["<_ as core::cmp::Ord>::clamp", "Argument[self,0,1]", "ReturnValue", "value", "manual"]
Copy link
Contributor

@geoffw0 geoffw0 Dec 15, 2025

Choose a reason for hiding this comment

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

Oh its nice to see Rust has a clamp method (and we're modelling it).

- addsTo:
pack: codeql/rust-all
extensible: sourceModel
Expand Down
4 changes: 2 additions & 2 deletions rust/ql/test/library-tests/dataflow/global/CONSISTENCY/PathResolutionConsistency.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
multipleResolvedTargets
| main.rs:236:11:236:15 | * ... |
| main.rs:272:13:272:29 | * ... |
| main.rs:252:11:252:15 | * ... |
| main.rs:288:13:288:29 | * ... |
792 changes: 396 additions & 396 deletions rust/ql/test/library-tests/dataflow/global/inline-flow.expected
View file
Open in desktop

Large diffs are not rendered by default.

28 changes: 24 additions & 4 deletions rust/ql/test/library-tests/dataflow/global/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,19 @@ impl MyFlag {
}

fn get_data(self) -> i64 {
if self.flag { 0 } else { source(2) }
if self.flag {
0
} else {
source(2)
}
}

fn data_through(self, n: i64) -> i64 {
if self.flag { 0 } else { n }
if self.flag {
0
} else {
n
}
}
}

Expand All @@ -120,11 +128,19 @@ impl MyTrait for MyFlag {
}

fn get_data_trait(self) -> i64 {
if self.flag { 0 } else { source(21) }
if self.flag {
0
} else {
source(21)
}
}

fn data_through_trait(self, n: i64) -> i64 {
if self.flag { 0 } else { n }
if self.flag {
0
} else {
n
}
}
}

Expand Down Expand Up @@ -275,6 +291,10 @@ fn test_operator_overloading() {
let a = MyInt { value: source(28) };
let c = *a;
sink(c); // $ hasValueFlow=28

let a = MyInt { value: source(29) };
let c = a.min(1042);
sink(c); // $ MISSING: hasValueFlow=29
}

trait MyTrait2 {
Expand Down
218 changes: 110 additions & 108 deletions rust/ql/test/library-tests/dataflow/global/viableCallable.expected
View file
Open in desktop

Large diffs are not rendered by default.

153 changes: 110 additions & 43 deletions rust/ql/test/library-tests/dataflow/modeled/inline-flow.expected
View file
Open in desktop

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions rust/ql/test/library-tests/dataflow/modeled/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,29 @@ fn test_pin() {
}
}

fn test_ord() {
let a = source(50);
let b = source(51);
let c = a.min(b);
sink(c); // $ hasValueFlow=50 hasValueFlow=51

let d = source(52);
let e = source(53);
let f = d.max(e);
sink(f); // $ hasValueFlow=52 hasValueFlow=53

let g = source(54);
let h = source(55);
let i = source(56);
let j = g.clamp(h, i);
sink(j); // $ hasValueFlow=54 hasValueFlow=55 hasValueFlow=56
}

fn main() {
option_clone();
result_clone();
i64_clone();
my_clone::wrapper_clone();
test_pin();
test_ord();
}
2 changes: 1 addition & 1 deletion rust/ql/test/library-tests/dataflow/models/models.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ models
| 6 | Source: main::enum_source; ReturnValue.Field[main::MyFieldEnum::D::field_d]; test-source |
| 7 | Source: main::simple_source; ReturnValue; test-source |
| 8 | Source: main::source_into_function::pass_source; Argument[1].Parameter[0]; test-source |
| 9 | Summary: <_ as core::cmp::Ord>::max; Argument[self]; ReturnValue; value |
| 9 | Summary: <_ as core::cmp::Ord>::max; Argument[self,0]; ReturnValue; value |
| 10 | Summary: <_ as core::cmp::PartialOrd>::lt; Argument[self].Reference; ReturnValue; taint |
| 11 | Summary: <_ as core::ops::index::Index>::index; Argument[self].Reference.Element; ReturnValue.Reference; value |
| 12 | Summary: main::apply; Argument[0]; Argument[1].Parameter[0]; value |
Expand Down
1 change: 0 additions & 1 deletion rust/ql/test/library-tests/dataflow/models/models.ext.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,4 @@ extensions:
- ["main::apply", "Argument[0]", "Argument[1].Parameter[0]", "value", "manual"]
- ["main::apply", "Argument[1].ReturnValue", "ReturnValue", "value", "manual"]
- ["main::get_async_number", "Argument[0]", "ReturnValue.Future", "value", "manual"]
- ["<_ as core::cmp::Ord>::max", "Argument[self]", "ReturnValue", "value", "manual"]
- ["<_ as core::cmp::PartialOrd>::lt", "Argument[self].Reference", "ReturnValue", "taint", "manual"]