Skip to content

Commit e5b7f17

Browse files
authored
Merge pull request #121 from hug-dev/upgrade-prost
Upgrade prost to 0.8.0
2 parents 79b6f18 + ea2752e commit e5b7f17

31 files changed

+155
-146
lines changed

.cargo/audit.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[advisories]
2-
ignore = ["RUSTSEC-2021-0073", # We do not use `prost_types::Timestamp` anywhere in our code.
3-
"RUSTSEC-2020-0036"] # We don't have control over the exact dependencies of `protoc-grpcio`; See https://github.com/mtp401/protoc-grpcio/issues/36
2+
ignore = []
43
informational_warnings = ["unmaintained"] # warn for categories of informational advisories
54
severity_threshold = "low" # CVSS severity ("none", "low", "medium", "high", "critical")
65

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ categories = ["encoding"]
1111
edition = "2018"
1212

1313
[build-dependencies]
14-
prost-build = { version = "0.6.1", optional = true }
14+
prost-build = { version = "0.8.0", optional = true }
1515

1616
[dependencies]
1717
serde = { version = "1.0.115", features = ["derive"] }
1818
bincode = "1.3.1"
1919
num-traits = "0.2.12"
2020
num-derive = "0.3.2"
2121
num = "0.3.0"
22-
prost = "0.6.1"
22+
prost = "0.8.0"
2323
arbitrary = { version = "0.4.6", features = ["derive"], optional = true }
2424
uuid = "0.8.1"
2525
log = "0.4.11"

src/operations_protobuf/generated_ops/delete_client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#[derive(Clone, PartialEq, ::prost::Message)]
22
pub struct Operation {
33
#[prost(string, tag="1")]
4-
pub client: std::string::String,
4+
pub client: ::prost::alloc::string::String,
55
}
66
#[derive(Clone, PartialEq, ::prost::Message)]
77
pub struct Result {

src/operations_protobuf/generated_ops/list_authenticators.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#[derive(Clone, PartialEq, ::prost::Message)]
22
pub struct AuthenticatorInfo {
33
#[prost(string, tag="1")]
4-
pub description: std::string::String,
4+
pub description: ::prost::alloc::string::String,
55
#[prost(uint32, tag="2")]
66
pub version_maj: u32,
77
#[prost(uint32, tag="3")]
@@ -17,5 +17,5 @@ pub struct Operation {
1717
#[derive(Clone, PartialEq, ::prost::Message)]
1818
pub struct Result {
1919
#[prost(message, repeated, tag="1")]
20-
pub authenticators: ::std::vec::Vec<AuthenticatorInfo>,
20+
pub authenticators: ::prost::alloc::vec::Vec<AuthenticatorInfo>,
2121
}

src/operations_protobuf/generated_ops/list_clients.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ pub struct Operation {
44
#[derive(Clone, PartialEq, ::prost::Message)]
55
pub struct Result {
66
#[prost(string, repeated, tag="1")]
7-
pub clients: ::std::vec::Vec<std::string::String>,
7+
pub clients: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
88
}

src/operations_protobuf/generated_ops/list_keys.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ pub struct KeyInfo {
33
#[prost(uint32, tag="1")]
44
pub provider_id: u32,
55
#[prost(string, tag="2")]
6-
pub name: std::string::String,
6+
pub name: ::prost::alloc::string::String,
77
#[prost(message, optional, tag="3")]
8-
pub attributes: ::std::option::Option<super::psa_key_attributes::KeyAttributes>,
8+
pub attributes: ::core::option::Option<super::psa_key_attributes::KeyAttributes>,
99
}
1010
#[derive(Clone, PartialEq, ::prost::Message)]
1111
pub struct Operation {
1212
}
1313
#[derive(Clone, PartialEq, ::prost::Message)]
1414
pub struct Result {
1515
#[prost(message, repeated, tag="1")]
16-
pub keys: ::std::vec::Vec<KeyInfo>,
16+
pub keys: ::prost::alloc::vec::Vec<KeyInfo>,
1717
}

src/operations_protobuf/generated_ops/list_opcodes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ pub struct Operation {
66
#[derive(Clone, PartialEq, ::prost::Message)]
77
pub struct Result {
88
#[prost(uint32, repeated, tag="1")]
9-
pub opcodes: ::std::vec::Vec<u32>,
9+
pub opcodes: ::prost::alloc::vec::Vec<u32>,
1010
}

src/operations_protobuf/generated_ops/list_providers.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#[derive(Clone, PartialEq, ::prost::Message)]
22
pub struct ProviderInfo {
33
#[prost(string, tag="1")]
4-
pub uuid: std::string::String,
4+
pub uuid: ::prost::alloc::string::String,
55
#[prost(string, tag="2")]
6-
pub description: std::string::String,
6+
pub description: ::prost::alloc::string::String,
77
#[prost(string, tag="3")]
8-
pub vendor: std::string::String,
8+
pub vendor: ::prost::alloc::string::String,
99
#[prost(uint32, tag="4")]
1010
pub version_maj: u32,
1111
#[prost(uint32, tag="5")]
@@ -21,5 +21,5 @@ pub struct Operation {
2121
#[derive(Clone, PartialEq, ::prost::Message)]
2222
pub struct Result {
2323
#[prost(message, repeated, tag="1")]
24-
pub providers: ::std::vec::Vec<ProviderInfo>,
24+
pub providers: ::prost::alloc::vec::Vec<ProviderInfo>,
2525
}
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
#[derive(Clone, PartialEq, ::prost::Message)]
22
pub struct Operation {
33
#[prost(string, tag="1")]
4-
pub key_name: std::string::String,
4+
pub key_name: ::prost::alloc::string::String,
55
#[prost(message, optional, tag="2")]
6-
pub alg: ::std::option::Option<super::psa_algorithm::algorithm::Aead>,
7-
#[prost(bytes, tag="3")]
8-
pub nonce: std::vec::Vec<u8>,
9-
#[prost(bytes, tag="4")]
10-
pub additional_data: std::vec::Vec<u8>,
11-
#[prost(bytes, tag="5")]
12-
pub ciphertext: std::vec::Vec<u8>,
6+
pub alg: ::core::option::Option<super::psa_algorithm::algorithm::Aead>,
7+
#[prost(bytes="vec", tag="3")]
8+
pub nonce: ::prost::alloc::vec::Vec<u8>,
9+
#[prost(bytes="vec", tag="4")]
10+
pub additional_data: ::prost::alloc::vec::Vec<u8>,
11+
#[prost(bytes="vec", tag="5")]
12+
pub ciphertext: ::prost::alloc::vec::Vec<u8>,
1313
}
1414
#[derive(Clone, PartialEq, ::prost::Message)]
1515
pub struct Result {
16-
#[prost(bytes, tag="1")]
17-
pub plaintext: std::vec::Vec<u8>,
16+
#[prost(bytes="vec", tag="1")]
17+
pub plaintext: ::prost::alloc::vec::Vec<u8>,
1818
}
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
#[derive(Clone, PartialEq, ::prost::Message)]
22
pub struct Operation {
33
#[prost(string, tag="1")]
4-
pub key_name: std::string::String,
4+
pub key_name: ::prost::alloc::string::String,
55
#[prost(message, optional, tag="2")]
6-
pub alg: ::std::option::Option<super::psa_algorithm::algorithm::Aead>,
7-
#[prost(bytes, tag="3")]
8-
pub nonce: std::vec::Vec<u8>,
9-
#[prost(bytes, tag="4")]
10-
pub additional_data: std::vec::Vec<u8>,
11-
#[prost(bytes, tag="5")]
12-
pub plaintext: std::vec::Vec<u8>,
6+
pub alg: ::core::option::Option<super::psa_algorithm::algorithm::Aead>,
7+
#[prost(bytes="vec", tag="3")]
8+
pub nonce: ::prost::alloc::vec::Vec<u8>,
9+
#[prost(bytes="vec", tag="4")]
10+
pub additional_data: ::prost::alloc::vec::Vec<u8>,
11+
#[prost(bytes="vec", tag="5")]
12+
pub plaintext: ::prost::alloc::vec::Vec<u8>,
1313
}
1414
#[derive(Clone, PartialEq, ::prost::Message)]
1515
pub struct Result {
16-
#[prost(bytes, tag="1")]
17-
pub ciphertext: std::vec::Vec<u8>,
16+
#[prost(bytes="vec", tag="1")]
17+
pub ciphertext: ::prost::alloc::vec::Vec<u8>,
1818
}

0 commit comments

Comments
 (0)