mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-24 15:02:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix #[warn(clippy::try_err)] in ser_macros.rs

Browse source
This commit is contained in:
Jeffrey Czyz 2021-08-02 09:29:49 -05:00
parent bee9a1e403
commit 58a4dc0ef4
No known key found for this signature in database
GPG key ID: 3A4E08275D5E96D2
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lightning/src/util/ser_macros.rs
View file

@ -93,7 +93,7 @@ macro_rules! check_tlv_order {
#[allow(unused_comparisons)] // Note that $type may be 0 making the second comparison always true
let invalid_order = ($last_seen_type.is_none() || $last_seen_type.unwrap() < $type) && $typ.0 > $type;
if invalid_order {
Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
}
}};
($last_seen_type: expr, $typ: expr, $type: expr, option) => {{
@ -109,7 +109,7 @@ macro_rules! check_missing_tlv {
#[allow(unused_comparisons)] // Note that $type may be 0 making the second comparison always true
let missing_req_type = $last_seen_type.is_none() || $last_seen_type.unwrap() < $type;
if missing_req_type {
Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
}
}};
($last_seen_type: expr, $type: expr, vec_type) => {{
@ -149,12 +149,12 @@ macro_rules! decode_tlv_stream {
match ser::Readable::read(&mut tracking_reader) {
Err(DecodeError::ShortRead) => {
if !tracking_reader.have_read {
break 'tlv_read
break 'tlv_read;
} else {
Err(DecodeError::ShortRead)?
return Err(DecodeError::ShortRead);
}
},
Err(e) => Err(e)?,
Err(e) => return Err(e),
Ok(t) => t,
}
};
@ -162,7 +162,7 @@ macro_rules! decode_tlv_stream {
// Types must be unique and monotonically increasing:
match last_seen_type {
Some(t) if typ.0 <= t => {
Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
},
_ => {},
}
@ -180,11 +180,11 @@ macro_rules! decode_tlv_stream {
decode_tlv!(s, $field, $fieldty);
if s.bytes_remain() {
s.eat_remaining()?; // Return ShortRead if there's actually not enough bytes
Err(DecodeError::InvalidValue)?
return Err(DecodeError::InvalidValue);
}
},)*
x if x % 2 == 0 => {
Err(DecodeError::UnknownRequiredFeature)?
return Err(DecodeError::UnknownRequiredFeature);
},
_ => {},
}
@ -490,7 +490,7 @@ macro_rules! impl_writeable_tlv_based_enum {
Ok($st::$tuple_variant_name(Readable::read(reader)?))
}),*
_ => {
Err(DecodeError::UnknownRequiredFeature)?
Err(DecodeError::UnknownRequiredFeature)
},
}
}