Skip to content

Commit bea5381

Browse files
redsun82redsun82
committed
Rust: replace last hand-written instances of Field[crate:: 
1 parent c6c52ed commit bea5381

File tree

6 files changed

+36
-36
lines changed

6 files changed

+36
-36
lines changed

‎rust/ql/lib/codeql/rust/frameworks/async-rs.model.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ extensions:
33
pack: codeql/rust-all
44
extensible: sourceModel
55
data:
6-
- ["repo:https://github.com/async-rs/async-std:async-std", "<crate::net::tcp::stream::TcpStream>::connect", "ReturnValue.Future.Field[crate::result::Result::Ok(0)]", "remote", "manual"]
6+
- ["repo:https://github.com/async-rs/async-std:async-std", "<crate::net::tcp::stream::TcpStream>::connect", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "remote", "manual"]

‎rust/ql/lib/codeql/rust/frameworks/futures.model.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ extensions:
1313
- ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::io::AsyncBufReadExt::read_line", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
1414
- ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::io::AsyncBufReadExt::read_until", "Argument[self]", "Argument[1].Reference", "taint", "manual"]
1515
- ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::io::AsyncBufReadExt::read_until", "Argument[self].Reference", "Argument[1].Reference", "taint", "manual"]
16-
- ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::io::AsyncBufReadExt::fill_buf", "Argument[self]", "ReturnValue.Future.Field[crate::result::Result::Ok(0)]", "taint", "manual"]
16+
- ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::io::AsyncBufReadExt::fill_buf", "Argument[self]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
1717
- ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::io::AsyncBufReadExt::lines", "Argument[self]", "ReturnValue", "taint", "manual"]
18-
- ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::stream::stream::StreamExt::next", "Argument[self]", "ReturnValue.Future.Field[crate::option::Option::Some(0)]", "taint", "manual"]
19-
- ["repo:https://github.com/rust-lang/futures-rs:futures-util", "<crate::io::buf_reader::BufReader as crate::if_std::AsyncBufRead>::poll_fill_buf", "Argument[self].Reference", "ReturnValue.Field[crate::task::poll::Poll::Ready(0)].Field[crate::result::Result::Ok(0)]", "taint", "manual"]
18+
- ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::stream::stream::StreamExt::next", "Argument[self]", "ReturnValue.Future.Field[core::option::Option::Some(0)]", "taint", "manual"]
19+
- ["repo:https://github.com/rust-lang/futures-rs:futures-util", "<crate::io::buf_reader::BufReader as crate::if_std::AsyncBufRead>::poll_fill_buf", "Argument[self].Reference", "ReturnValue.Field[core::task::poll::Poll::Ready(0)].Field[core::result::Result::Ok(0)]", "taint", "manual"]

‎rust/ql/lib/codeql/rust/frameworks/rustls.model.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ extensions:
33
pack: codeql/rust-all
44
extensible: sourceModel
55
data:
6-
- ["repo:https://github.com/rustls/rustls:rustls", "<crate::client::client_conn::connection::ClientConnection>::new", "ReturnValue.Field[crate::result::Result::Ok(0)]", "remote", "manual"]
6+
- ["repo:https://github.com/rustls/rustls:rustls", "<crate::client::client_conn::connection::ClientConnection>::new", "ReturnValue.Field[core::result::Result::Ok(0)]", "remote", "manual"]
77
- addsTo:
88
pack: codeql/rust-all
99
extensible: summaryModel
1010
data:
11-
- ["repo:https://github.com/quininer/futures-rustls:futures-rustls", "<crate::TlsConnector>::connect", "Argument[1]", "ReturnValue.Future.Field[crate::result::Result::Ok(0)]", "taint", "manual"]
11+
- ["repo:https://github.com/quininer/futures-rustls:futures-rustls", "<crate::TlsConnector>::connect", "Argument[1]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
1212
- ["repo:https://github.com/quininer/futures-rustls:futures-rustls", "<crate::client::TlsStream as crate::if_std::AsyncRead>::poll_read", "Argument[self].Reference", "Argument[1].Reference", "taint", "manual"]
1313
- ["repo:https://github.com/rustls/rustls:rustls", "<crate::conn::ConnectionCommon>::reader", "Argument[self]", "ReturnValue", "taint", "manual"]
1414
- ["repo:https://github.com/rustls/rustls:rustls", "<crate::conn::connection::Reader as crate::io::Read>::read", "Argument[self]", "Argument[0].Reference", "taint", "manual"]

‎rust/ql/test/library-tests/dataflow/models/models.expected

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
models
2-
| 1 | Sink: repo::test; <crate::MyFieldEnum>::sink; test-sink; Argument[self].Field[crate::MyFieldEnum::D::field_d] |
3-
| 2 | Sink: repo::test; crate::enum_sink; test-sink; Argument[0].Field[crate::MyFieldEnum::C::field_c] |
2+
| 1 | Sink: repo::test; <crate::MyFieldEnum>::sink; test-sink; Argument[self].Field[test::MyFieldEnum::D::field_d] |
3+
| 2 | Sink: repo::test; crate::enum_sink; test-sink; Argument[0].Field[test::MyFieldEnum::C::field_c] |
44
| 3 | Sink: repo::test; crate::simple_sink; test-sink; Argument[0] |
5-
| 4 | Source: repo::test; <crate::MyFieldEnum>::source; test-source; ReturnValue.Field[crate::MyFieldEnum::C::field_c] |
5+
| 4 | Source: repo::test; <crate::MyFieldEnum>::source; test-source; ReturnValue.Field[test::MyFieldEnum::C::field_c] |
66
| 5 | Source: repo::test; crate::arg_source; test-source; Argument[0] |
7-
| 6 | Source: repo::test; crate::enum_source; test-source; ReturnValue.Field[crate::MyFieldEnum::D::field_d] |
7+
| 6 | Source: repo::test; crate::enum_source; test-source; ReturnValue.Field[test::MyFieldEnum::D::field_d] |
88
| 7 | Source: repo::test; crate::simple_source; test-source; ReturnValue |
99
| 8 | Summary: repo::test; crate::apply; Argument[0]; Argument[1].Parameter[0]; value |
1010
| 9 | Summary: repo::test; crate::apply; Argument[1].ReturnValue; ReturnValue; value |
1111
| 10 | Summary: repo::test; crate::coerce; Argument[0]; ReturnValue; taint |
1212
| 11 | Summary: repo::test; crate::get_array_element; Argument[0].Element; ReturnValue; value |
1313
| 12 | Summary: repo::test; crate::get_async_number; Argument[0]; ReturnValue.Future; value |
14-
| 13 | Summary: repo::test; crate::get_struct_field; Argument[0].Field[crate::MyStruct::field1]; ReturnValue; value |
14+
| 13 | Summary: repo::test; crate::get_struct_field; Argument[0].Field[test::MyStruct::field1]; ReturnValue; value |
1515
| 14 | Summary: repo::test; crate::get_tuple_element; Argument[0].Field[0]; ReturnValue; value |
16-
| 15 | Summary: repo::test; crate::get_var_field; Argument[0].Field[crate::MyFieldEnum::C::field_c]; ReturnValue; value |
17-
| 16 | Summary: repo::test; crate::get_var_pos; Argument[0].Field[crate::MyPosEnum::A(0)]; ReturnValue; value |
16+
| 15 | Summary: repo::test; crate::get_var_field; Argument[0].Field[test::MyFieldEnum::C::field_c]; ReturnValue; value |
17+
| 16 | Summary: repo::test; crate::get_var_pos; Argument[0].Field[test::MyPosEnum::A(0)]; ReturnValue; value |
1818
| 17 | Summary: repo::test; crate::set_array_element; Argument[0]; ReturnValue.Element; value |
19-
| 18 | Summary: repo::test; crate::set_struct_field; Argument[0]; ReturnValue.Field[crate::MyStruct::field2]; value |
19+
| 18 | Summary: repo::test; crate::set_struct_field; Argument[0]; ReturnValue.Field[test::MyStruct::field2]; value |
2020
| 19 | Summary: repo::test; crate::set_tuple_element; Argument[0]; ReturnValue.Field[1]; value |
21-
| 20 | Summary: repo::test; crate::set_var_field; Argument[0]; ReturnValue.Field[crate::MyFieldEnum::D::field_d]; value |
22-
| 21 | Summary: repo::test; crate::set_var_pos; Argument[0]; ReturnValue.Field[crate::MyPosEnum::B(0)]; value |
21+
| 20 | Summary: repo::test; crate::set_var_field; Argument[0]; ReturnValue.Field[test::MyFieldEnum::D::field_d]; value |
22+
| 21 | Summary: repo::test; crate::set_var_pos; Argument[0]; ReturnValue.Field[test::MyPosEnum::B(0)]; value |
2323
edges
2424
| main.rs:15:9:15:9 | s | main.rs:16:19:16:19 | s | provenance | |
2525
| main.rs:15:9:15:9 | s | main.rs:16:19:16:19 | s | provenance | |

‎rust/ql/test/library-tests/dataflow/models/models.ext.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@ extensions:
44
extensible: sourceModel
55
data:
66
- ["repo::test", "crate::simple_source", "ReturnValue", "test-source", "manual"]
7-
- ["repo::test", "crate::enum_source", "ReturnValue.Field[crate::MyFieldEnum::D::field_d]", "test-source", "manual"]
8-
- ["repo::test", "<crate::MyFieldEnum>::source", "ReturnValue.Field[crate::MyFieldEnum::C::field_c]", "test-source", "manual"]
7+
- ["repo::test", "crate::enum_source", "ReturnValue.Field[test::MyFieldEnum::D::field_d]", "test-source", "manual"]
8+
- ["repo::test", "<crate::MyFieldEnum>::source", "ReturnValue.Field[test::MyFieldEnum::C::field_c]", "test-source", "manual"]
99
- ["repo::test", "crate::arg_source", "Argument[0]", "test-source", "manual"]
1010
- addsTo:
1111
pack: codeql/rust-all
1212
extensible: sinkModel
1313
data:
1414
- ["repo::test", "crate::simple_sink", "Argument[0]", "test-sink", "manual"]
15-
- ["repo::test", "crate::enum_sink", "Argument[0].Field[crate::MyFieldEnum::C::field_c]", "test-sink", "manual"]
16-
- ["repo::test", "<crate::MyFieldEnum>::sink", "Argument[self].Field[crate::MyFieldEnum::D::field_d]", "test-sink", "manual"]
15+
- ["repo::test", "crate::enum_sink", "Argument[0].Field[test::MyFieldEnum::C::field_c]", "test-sink", "manual"]
16+
- ["repo::test", "<crate::MyFieldEnum>::sink", "Argument[self].Field[test::MyFieldEnum::D::field_d]", "test-sink", "manual"]
1717
- addsTo:
1818
pack: codeql/rust-all
1919
extensible: summaryModel
2020
data:
2121
- ["repo::test", "crate::coerce", "Argument[0]", "ReturnValue", "taint", "manual"]
22-
- ["repo::test", "crate::get_var_pos", "Argument[0].Field[crate::MyPosEnum::A(0)]", "ReturnValue", "value", "manual"]
23-
- ["repo::test", "crate::set_var_pos", "Argument[0]", "ReturnValue.Field[crate::MyPosEnum::B(0)]", "value", "manual"]
24-
- ["repo::test", "crate::get_var_field", "Argument[0].Field[crate::MyFieldEnum::C::field_c]", "ReturnValue", "value", "manual"]
25-
- ["repo::test", "crate::set_var_field", "Argument[0]", "ReturnValue.Field[crate::MyFieldEnum::D::field_d]", "value", "manual"]
26-
- ["repo::test", "crate::get_struct_field", "Argument[0].Field[crate::MyStruct::field1]", "ReturnValue", "value", "manual"]
27-
- ["repo::test", "crate::set_struct_field", "Argument[0]", "ReturnValue.Field[crate::MyStruct::field2]", "value", "manual"]
22+
- ["repo::test", "crate::get_var_pos", "Argument[0].Field[test::MyPosEnum::A(0)]", "ReturnValue", "value", "manual"]
23+
- ["repo::test", "crate::set_var_pos", "Argument[0]", "ReturnValue.Field[test::MyPosEnum::B(0)]", "value", "manual"]
24+
- ["repo::test", "crate::get_var_field", "Argument[0].Field[test::MyFieldEnum::C::field_c]", "ReturnValue", "value", "manual"]
25+
- ["repo::test", "crate::set_var_field", "Argument[0]", "ReturnValue.Field[test::MyFieldEnum::D::field_d]", "value", "manual"]
26+
- ["repo::test", "crate::get_struct_field", "Argument[0].Field[test::MyStruct::field1]", "ReturnValue", "value", "manual"]
27+
- ["repo::test", "crate::set_struct_field", "Argument[0]", "ReturnValue.Field[test::MyStruct::field2]", "value", "manual"]
2828
- ["repo::test", "crate::get_array_element", "Argument[0].Element", "ReturnValue", "value", "manual"]
2929
- ["repo::test", "crate::set_array_element", "Argument[0]", "ReturnValue.Element", "value", "manual"]
3030
- ["repo::test", "crate::get_tuple_element", "Argument[0].Field[0]", "ReturnValue", "value", "manual"]

‎rust/ql/test/utils-tests/modelgenerator/summaries.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@ pub enum Either<A, B> {
1616
use Either::*;
1717

1818
impl<A, B> Either<A, B> {
19-
// summary=repo::test;<crate::summaries::Either>::new;Argument[0];ReturnValue.Field[crate::summaries::Either::Right(0)];value;dfc-generated
19+
// summary=repo::test;<crate::summaries::Either>::new;Argument[0];ReturnValue.Field[test::summaries::Either::Right(0)];value;dfc-generated
2020
pub fn new(b: B) -> Self {
2121
Right(b)
2222
}
2323

24-
// summary=repo::test;<crate::summaries::Either>::unwrap;Argument[self].Field[crate::summaries::Either::Right(0)];ReturnValue;value;dfc-generated
24+
// summary=repo::test;<crate::summaries::Either>::unwrap;Argument[self].Field[test::summaries::Either::Right(0)];ReturnValue;value;dfc-generated
2525
pub fn unwrap(self) -> B {
2626
match self {
2727
Left(a) => panic!("Left cannot be unwrapped"),
2828
Right(b) => b,
2929
}
3030
}
3131

32-
// summary=repo::test;<crate::summaries::Either>::zip;Argument[0].Field[crate::summaries::Either::Left(0)];ReturnValue.Field[crate::summaries::Either::Left(0)];value;dfc-generated
33-
// summary=repo::test;<crate::summaries::Either>::zip;Argument[0].Field[crate::summaries::Either::Right(0)];ReturnValue.Field[crate::summaries::Either::Right(0)].Field[1];value;dfc-generated
34-
// summary=repo::test;<crate::summaries::Either>::zip;Argument[self].Field[crate::summaries::Either::Left(0)];ReturnValue.Field[crate::summaries::Either::Left(0)];value;dfc-generated
35-
// summary=repo::test;<crate::summaries::Either>::zip;Argument[self].Field[crate::summaries::Either::Right(0)];ReturnValue.Field[crate::summaries::Either::Right(0)].Field[0];value;dfc-generated
32+
// summary=repo::test;<crate::summaries::Either>::zip;Argument[0].Field[test::summaries::Either::Left(0)];ReturnValue.Field[test::summaries::Either::Left(0)];value;dfc-generated
33+
// summary=repo::test;<crate::summaries::Either>::zip;Argument[0].Field[test::summaries::Either::Right(0)];ReturnValue.Field[test::summaries::Either::Right(0)].Field[1];value;dfc-generated
34+
// summary=repo::test;<crate::summaries::Either>::zip;Argument[self].Field[test::summaries::Either::Left(0)];ReturnValue.Field[test::summaries::Either::Left(0)];value;dfc-generated
35+
// summary=repo::test;<crate::summaries::Either>::zip;Argument[self].Field[test::summaries::Either::Right(0)];ReturnValue.Field[test::summaries::Either::Right(0)].Field[0];value;dfc-generated
3636
pub fn zip<C>(self, other: Either<A, C>) -> Either<A, (B, C)> {
3737
match (self, other) {
3838
(Right(b), Right(d)) => Right((b, d)),
@@ -48,20 +48,20 @@ pub struct MyStruct {
4848
}
4949

5050
impl MyStruct {
51-
// summary=repo::test;<crate::summaries::MyStruct>::new;Argument[0];ReturnValue.Field[crate::summaries::MyStruct::foo];value;dfc-generated
52-
// summary=repo::test;<crate::summaries::MyStruct>::new;Argument[1];ReturnValue.Field[crate::summaries::MyStruct::bar];value;dfc-generated
51+
// summary=repo::test;<crate::summaries::MyStruct>::new;Argument[0];ReturnValue.Field[test::summaries::MyStruct::foo];value;dfc-generated
52+
// summary=repo::test;<crate::summaries::MyStruct>::new;Argument[1];ReturnValue.Field[test::summaries::MyStruct::bar];value;dfc-generated
5353
pub fn new(a: i64, b: f64) -> MyStruct {
5454
MyStruct { foo: a, bar: b }
5555
}
5656

57-
// summary=repo::test;<crate::summaries::MyStruct>::get_foo;Argument[self].Field[crate::summaries::MyStruct::foo];ReturnValue;value;dfc-generated
57+
// summary=repo::test;<crate::summaries::MyStruct>::get_foo;Argument[self].Field[test::summaries::MyStruct::foo];ReturnValue;value;dfc-generated
5858
pub fn get_foo(self) -> i64 {
5959
match self {
6060
MyStruct { foo, bar: _ } => foo,
6161
}
6262
}
6363

64-
// summary=repo::test;<crate::summaries::MyStruct>::get_bar;Argument[self].Field[crate::summaries::MyStruct::bar];ReturnValue;value;dfc-generated
64+
// summary=repo::test;<crate::summaries::MyStruct>::get_bar;Argument[self].Field[test::summaries::MyStruct::bar];ReturnValue;value;dfc-generated
6565
pub fn get_bar(self) -> f64 {
6666
match self {
6767
MyStruct { foo: _, bar } => bar,

0 commit comments

Comments
 (0)