From b477464d758f22a05072c54939701e36c366838d Mon Sep 17 00:00:00 2001 From: dishmaker <141624503+dishmaker@users.noreply.github.com> Date: Sat, 29 Aug 2026 19:13:02 +0200 Subject: [PATCH 1/2] apply clippy fixes pkcs12, x509-cert: clippy 0.1.100 (17fd5b8a37 2026-08-28) --- Cargo.toml | 1 - pkcs12/src/safe_bag.rs | 6 +++--- x509-cert/src/ext/pkix/sct.rs | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 76339a17c..91df57938 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -70,7 +70,6 @@ cast_precision_loss = "warn" cast_sign_loss = "warn" checked_conversions = "warn" doc_markdown = "warn" -from_iter_instead_of_collect = "warn" implicit_saturating_sub = "warn" manual_assert = "warn" map_unwrap_or = "warn" diff --git a/pkcs12/src/safe_bag.rs b/pkcs12/src/safe_bag.rs index eb4ffb61f..e982abd90 100644 --- a/pkcs12/src/safe_bag.rs +++ b/pkcs12/src/safe_bag.rs @@ -44,9 +44,9 @@ impl<'a> ::der::DecodeValue<'a> for SafeBag { _header: ::der::Header, ) -> ::der::Result { let bag_id = reader.decode()?; - let bag_value = match reader.tlv_bytes() { - Ok(v) => v.to_vec(), - Err(e) => return Err(e), + let bag_value = { + let v = reader.tlv_bytes()?; + v.to_vec() }; let bag_attributes = reader.decode()?; Ok(Self { diff --git a/x509-cert/src/ext/pkix/sct.rs b/x509-cert/src/ext/pkix/sct.rs index 236d08e46..c8f6c50f3 100644 --- a/x509-cert/src/ext/pkix/sct.rs +++ b/x509-cert/src/ext/pkix/sct.rs @@ -70,7 +70,7 @@ impl SignedCertificateTimestampList { pub fn parse_timestamps(&self) -> Result, Error> { let (tls_vec, rest) = TlsByteVecU16::tls_deserialize_bytes(self.0.as_bytes())?; if !rest.is_empty() { - return Err(tls_codec::Error::TrailingData)?; + return Err(tls_codec::Error::TrailingData.into()); } let mut bytes = tls_vec.as_slice(); let mut result = Vec::new(); @@ -112,7 +112,7 @@ impl SerializedSct { pub fn parse_timestamp(&self) -> Result { let (sct, rest) = SignedCertificateTimestamp::tls_deserialize_bytes(self.data.as_slice())?; if !rest.is_empty() { - return Err(tls_codec::Error::TrailingData)?; + return Err(tls_codec::Error::TrailingData.into()); } Ok(sct) } From fa00cbff4aea316310ee941632c09d5b070cca7c Mon Sep 17 00:00:00 2001 From: dishmaker <141624503+dishmaker@users.noreply.github.com> Date: Sat, 29 Aug 2026 19:33:56 +0200 Subject: [PATCH 2/2] pkcs12: simplify `reader.tlv_bytes()?.to_vec()` --- pkcs12/src/safe_bag.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkcs12/src/safe_bag.rs b/pkcs12/src/safe_bag.rs index e982abd90..212d8ce93 100644 --- a/pkcs12/src/safe_bag.rs +++ b/pkcs12/src/safe_bag.rs @@ -44,10 +44,7 @@ impl<'a> ::der::DecodeValue<'a> for SafeBag { _header: ::der::Header, ) -> ::der::Result { let bag_id = reader.decode()?; - let bag_value = { - let v = reader.tlv_bytes()?; - v.to_vec() - }; + let bag_value = reader.tlv_bytes()?.to_vec(); let bag_attributes = reader.decode()?; Ok(Self { bag_id,