Skip to content
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.

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

Use Rust 1.78 #151

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ readme = "README.md"
keywords = ["parsec", "interface", "serialization"]
categories = ["encoding"]
edition = "2018"
rust-version = "1.66.0"
rust-version = "1.78.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

We maintain this MSRV for all parsec projects, so we need to keep it at 1.66. Can you please revert this?


[build-dependencies]
prost-build = { version = "0.9.0", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion src/operations/psa_asymmetric_decrypt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ mod tests {
key_name: String::from("some key"),
alg: AsymmetricEncryption::RsaPkcs1v15Crypt,
ciphertext: Zeroizing::new(vec![0xff, 32]),
salt: Some(zeroize::Zeroizing::new(vec![0xff, 32])),
salt: Some(Zeroizing::new(vec![0xff, 32])),
})
.validate(get_attrs())
.unwrap_err(),
Expand Down
2 changes: 1 addition & 1 deletion src/operations/psa_import_key.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pub struct Operation {
// Debug is not derived for this because it could expose secrets if printed or logged
// somewhere
#[derivative(Debug = "ignore")]
pub data: crate::secrecy::Secret<Vec<u8>>,
pub data: secrecy::Secret<Vec<u8>>,
}

/// Native object for the result of a cryptographic key import operation.
Expand Down
2 changes: 1 addition & 1 deletion src/operations/psa_raw_key_agreement.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pub struct Result {
/// `data` holds the bytes defining the key, formatted as specified
/// by the provider for which the request was made.
#[derivative(Debug = "ignore")]
pub shared_secret: crate::secrecy::Secret<Vec<u8>>,
pub shared_secret: secrecy::Secret<Vec<u8>>,
}

impl Operation {
Expand Down
2 changes: 1 addition & 1 deletion src/operations_protobuf/convert_psa_cipher_decrypt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ mod test {
let mut proto: OperationProto = Default::default();
let message = vec![0x11, 0x22, 0x33];
let key_name = "test name".to_string();
let proto_alg = psa_crypto::types::algorithm::Cipher::StreamCipher;
let proto_alg = Cipher::StreamCipher;
proto.ciphertext = message.clone();
proto.alg = convert_psa_algorithm::cipher_to_i32(proto_alg);
proto.key_name = key_name.clone();
Expand Down
2 changes: 1 addition & 1 deletion src/operations_protobuf/convert_psa_cipher_encrypt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ mod test {
let mut proto: OperationProto = Default::default();
let message = vec![0x11, 0x22, 0x33];
let key_name = "test name".to_string();
let proto_alg = psa_crypto::types::algorithm::Cipher::StreamCipher;
let proto_alg = Cipher::StreamCipher;
proto.plaintext = message.clone();
proto.alg = convert_psa_algorithm::cipher_to_i32(proto_alg);
proto.key_name = key_name.clone();
Expand Down
2 changes: 1 addition & 1 deletion src/operations_protobuf/convert_psa_export_key.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ mod test {
#[test]
fn resp_export_pk_e2e() {
let result = Result {
data: secrecy::Secret::new(vec![0x11, 0x22, 0x33]),
data: Secret::new(vec![0x11, 0x22, 0x33]),
};
let body = CONVERTER
.result_to_body(NativeResult::PsaExportKey(result))
Expand Down
2 changes: 1 addition & 1 deletion tests/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ then
fi
if cargo clippy -h
then
cargo clippy --all-targets -- -D clippy::all -D clippy::cargo
Copy link
Contributor

Choose a reason for hiding this comment

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

Why this?

Copy link
Contributor

Choose a reason for hiding this comment

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

Tried it locally and I see new failures with clippy::all.
The errors are particularly of 2 types occurring at multiple places. It would be better to get rid of them instead of dropping this check here.

Copy link
Contributor

Choose a reason for hiding this comment

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

Would you be able to fix them in this PR please?

cargo clippy --all-targets -- -D clippy::cargo
fi

############################
Expand Down
Loading