Skip to content

Commit b24386f

Browse files
paldepindpaldepind
authored
Merge pull request github#18743 from paldepind/rust-add-generated-option-model
Rust: Add generated flow summaries for `Option`
2 parents 57a7cb4 + 655449b commit b24386f

File tree

5 files changed

+383
-58
lines changed

5 files changed

+383
-58
lines changed

‎rust/ql/lib/codeql/rust/frameworks/stdlib/lang-core.model.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,6 @@ extensions:
1111
- ["lang:core", "crate::iter::traits::iterator::Iterator::nth", "Argument[self].Element", "ReturnValue.Variant[crate::option::Option::Some(0)]", "value", "manual"]
1212
- ["lang:core", "crate::iter::traits::iterator::Iterator::collect", "Argument[self].Element", "ReturnValue.Element", "value", "manual"]
1313
# Option
14-
- ["lang:core", "<crate::option::Option>::unwrap", "Argument[self].Variant[crate::option::Option::Some(0)]", "ReturnValue", "value", "manual"]
15-
- ["lang:core", "<crate::option::Option>::unwrap_or", "Argument[self].Variant[crate::option::Option::Some(0)]", "ReturnValue", "value", "manual"]
16-
- ["lang:core", "<crate::option::Option>::unwrap_or", "Argument[0]", "ReturnValue", "value", "manual"]
17-
- ["lang:core", "<crate::option::Option>::unwrap_or_default", "Argument[self].Variant[crate::option::Option::Some(0)]", "ReturnValue", "value", "manual"]
18-
- ["lang:core", "<crate::option::Option>::unwrap_or_else", "Argument[self].Variant[crate::option::Option::Some(0)]", "ReturnValue", "value", "manual"]
19-
- ["lang:core", "<crate::option::Option>::unwrap_or_else", "Argument[0].ReturnValue", "ReturnValue", "value", "manual"]
20-
- ["lang:core", "<crate::option::Option>::unwrap_unchecked", "Argument[self].Variant[crate::option::Option::Some(0)]", "ReturnValue", "value", "manual"]
2114
- ["lang:core", "<crate::option::Option>::expect", "Argument[self].Variant[crate::option::Option::Some(0)]", "ReturnValue", "value", "manual"]
2215
# Result
2316
- ["lang:core", "<crate::result::Result>::unwrap", "Argument[self].Variant[crate::result::Result::Ok(0)]", "ReturnValue", "value", "manual"]

‎rust/ql/lib/ext/generated/option/lang::core.model.yml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
2+
extensions:
3+
- addsTo:
4+
pack: codeql/rust-all
5+
extensible: summaryModel
6+
data:
7+
- ["lang:core", "<crate::option::Option as crate::clone::Clone>::clone", "Argument[self].Variant[crate::option::Option::Some(0)]", "ReturnValue.Variant[crate::option::Option::Some(0)]", "value", "dfc-generated"]
8+
- ["lang:core", "<crate::option::Option as crate::convert::From>::from", "Argument[0].Reference.Variant[crate::option::Option::Some(0)]", "ReturnValue.Variant[crate::option::Option::Some(0)]", "value", "dfc-generated"]
9+
- ["lang:core", "<crate::option::Option as crate::convert::From>::from", "Argument[0]", "ReturnValue.Variant[crate::option::Option::Some(0)]", "value", "dfc-generated"]
10+
- ["lang:core", "<crate::option::Option>::and", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
11+
- ["lang:core", "<crate::option::Option>::and_then", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
12+
- ["lang:core", "<crate::option::Option>::and_then", "Argument[self].Variant[crate::option::Option::Some(0)]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
13+
- ["lang:core", "<crate::option::Option>::as_mut", "Argument[self].Reference.Variant[crate::option::Option::Some(0)]", "ReturnValue.Variant[crate::option::Option::Some(0)]", "value", "dfc-generated"]
14+
- ["lang:core", "<crate::option::Option>::as_ref", "Argument[self].Reference.Variant[crate::option::Option::Some(0)]", "ReturnValue.Variant[crate::option::Option::Some(0)]", "value", "dfc-generated"]
15+
- ["lang:core", "<crate::option::Option>::cloned", "Argument[self].Variant[crate::option::Option::Some(0)]", "ReturnValue.Variant[crate::option::Option::Some(0)]", "value", "dfc-generated"]
16+
- ["lang:core", "<crate::option::Option>::copied", "Argument[self].Variant[crate::option::Option::Some(0)].Reference", "ReturnValue.Variant[crate::option::Option::Some(0)]", "value", "dfc-generated"]
17+
- ["lang:core", "<crate::option::Option>::flatten", "Argument[self].Variant[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
18+
- ["lang:core", "<crate::option::Option>::get_or_insert", "Argument[0]", "Argument[self].Reference.Variant[crate::option::Option::Some(0)]", "value", "dfc-generated"]
19+
- ["lang:core", "<crate::option::Option>::get_or_insert", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
20+
- ["lang:core", "<crate::option::Option>::get_or_insert", "Argument[self].Reference.Variant[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
21+
- ["lang:core", "<crate::option::Option>::get_or_insert_default", "Argument[self].Reference.Variant[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
22+
- ["lang:core", "<crate::option::Option>::get_or_insert_with", "Argument[self].Reference.Variant[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
23+
- ["lang:core", "<crate::option::Option>::insert", "Argument[0]", "Argument[self].Reference.Variant[crate::option::Option::Some(0)]", "value", "dfc-generated"]
24+
- ["lang:core", "<crate::option::Option>::insert", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
25+
- ["lang:core", "<crate::option::Option>::insert", "Argument[self].Reference.Variant[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
26+
- ["lang:core", "<crate::option::Option>::inspect", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
27+
- ["lang:core", "<crate::option::Option>::is_none_or", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
28+
- ["lang:core", "<crate::option::Option>::is_none_or", "Argument[self].Variant[crate::option::Option::Some(0)]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
29+
- ["lang:core", "<crate::option::Option>::is_some_and", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
30+
- ["lang:core", "<crate::option::Option>::is_some_and", "Argument[self].Variant[crate::option::Option::Some(0)]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
31+
- ["lang:core", "<crate::option::Option>::map", "Argument[0].ReturnValue", "ReturnValue.Variant[crate::option::Option::Some(0)]", "value", "dfc-generated"]
32+
- ["lang:core", "<crate::option::Option>::map", "Argument[self].Variant[crate::option::Option::Some(0)]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
33+
- ["lang:core", "<crate::option::Option>::map_or", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
34+
- ["lang:core", "<crate::option::Option>::map_or", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
35+
- ["lang:core", "<crate::option::Option>::map_or", "Argument[self].Variant[crate::option::Option::Some(0)]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
36+
- ["lang:core", "<crate::option::Option>::map_or_else", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
37+
- ["lang:core", "<crate::option::Option>::map_or_else", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
38+
- ["lang:core", "<crate::option::Option>::map_or_else", "Argument[self].Variant[crate::option::Option::Some(0)]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
39+
- ["lang:core", "<crate::option::Option>::ok_or", "Argument[0]", "ReturnValue.Variant[crate::result::Result::Err(0)]", "value", "dfc-generated"]
40+
- ["lang:core", "<crate::option::Option>::ok_or", "Argument[self].Variant[crate::option::Option::Some(0)]", "ReturnValue.Variant[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
41+
- ["lang:core", "<crate::option::Option>::ok_or_else", "Argument[0].ReturnValue", "ReturnValue.Variant[crate::result::Result::Err(0)]", "value", "dfc-generated"]
42+
- ["lang:core", "<crate::option::Option>::ok_or_else", "Argument[self].Variant[crate::option::Option::Some(0)]", "ReturnValue.Variant[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
43+
- ["lang:core", "<crate::option::Option>::or", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
44+
- ["lang:core", "<crate::option::Option>::or", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
45+
- ["lang:core", "<crate::option::Option>::or_else", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
46+
- ["lang:core", "<crate::option::Option>::or_else", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
47+
- ["lang:core", "<crate::option::Option>::take_if", "Argument[self].Reference.Variant[crate::option::Option::Some(0)]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
48+
- ["lang:core", "<crate::option::Option>::transpose", "Argument[self].Variant[crate::option::Option::Some(0)].Variant[crate::result::Result::Err(0)]", "ReturnValue.Variant[crate::result::Result::Err(0)]", "value", "dfc-generated"]
49+
- ["lang:core", "<crate::option::Option>::transpose", "Argument[self].Variant[crate::option::Option::Some(0)].Variant[crate::result::Result::Ok(0)]", "ReturnValue.Variant[crate::result::Result::Ok(0)].Variant[crate::option::Option::Some(0)]", "value", "dfc-generated"]
50+
- ["lang:core", "<crate::option::Option>::unwrap", "Argument[self].Variant[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
51+
- ["lang:core", "<crate::option::Option>::unwrap_or", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
52+
- ["lang:core", "<crate::option::Option>::unwrap_or", "Argument[self].Variant[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
53+
- ["lang:core", "<crate::option::Option>::unwrap_or_default", "Argument[self].Variant[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
54+
- ["lang:core", "<crate::option::Option>::unwrap_or_else", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
55+
- ["lang:core", "<crate::option::Option>::unwrap_or_else", "Argument[self].Variant[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
56+
- ["lang:core", "<crate::option::Option>::unwrap_unchecked", "Argument[self].Variant[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
57+
- ["lang:core", "<crate::option::Option>::unzip", "Argument[self].Variant[crate::option::Option::Some(0)].Tuple[0]", "ReturnValue.Tuple[0].Variant[crate::option::Option::Some(0)]", "value", "dfc-generated"]
58+
- ["lang:core", "<crate::option::Option>::unzip", "Argument[self].Variant[crate::option::Option::Some(0)].Tuple[1]", "ReturnValue.Tuple[1].Variant[crate::option::Option::Some(0)]", "value", "dfc-generated"]
59+
- ["lang:core", "<crate::option::Option>::xor", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
60+
- ["lang:core", "<crate::option::Option>::xor", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
61+
- ["lang:core", "<crate::option::Option>::zip", "Argument[0].Variant[crate::option::Option::Some(0)]", "ReturnValue.Variant[crate::option::Option::Some(0)].Tuple[1]", "value", "dfc-generated"]
62+
- ["lang:core", "<crate::option::Option>::zip", "Argument[self].Variant[crate::option::Option::Some(0)]", "ReturnValue.Variant[crate::option::Option::Some(0)].Tuple[0]", "value", "dfc-generated"]
63+
- ["lang:core", "<crate::option::Option>::zip_with", "Argument[0].Variant[crate::option::Option::Some(0)]", "Argument[1].Parameter[1]", "value", "dfc-generated"]
64+
- ["lang:core", "<crate::option::Option>::zip_with", "Argument[1].ReturnValue", "ReturnValue.Variant[crate::option::Option::Some(0)]", "value", "dfc-generated"]
65+
- ["lang:core", "<crate::option::Option>::zip_with", "Argument[self].Variant[crate::option::Option::Some(0)]", "Argument[1].Parameter[0]", "value", "dfc-generated"]

0 commit comments

Comments
 (0)