Skip to content
Merged
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
1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 1 addition & 4 deletions pkcs12/src/safe_bag.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,7 @@ impl<'a> ::der::DecodeValue<'a> for SafeBag {
_header: ::der::Header,
) -> ::der::Result<Self> {
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 = reader.tlv_bytes()?.to_vec();
let bag_attributes = reader.decode()?;
Ok(Self {
bag_id,
Expand Down
4 changes: 2 additions & 2 deletions x509-cert/src/ext/pkix/sct.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ impl SignedCertificateTimestampList {
pub fn parse_timestamps(&self) -> Result<Vec<SerializedSct>, 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();
Expand Down Expand Up @@ -112,7 +112,7 @@ impl SerializedSct {
pub fn parse_timestamp(&self) -> Result<SignedCertificateTimestamp, Error> {
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)
}
Expand Down