Merge rust-bitcoin/rust-bitcoin#3428: CI fixes for latest nightly
c2674caf4c
clippy: remove some newly-detected unnecessary returns (Andrew Poelstra)053a633b27
clippy: change accidental doccomments into correct comments (Andrew Poelstra) Pull request description: Blocking #3427 ACKs for top commit: tcharding: ACKc2674caf4c
Tree-SHA512: 4e24e988cb27b47354c7f7b3474fc6647386379fe2e7581dde57daab75fd11d3a511084f5d00c7421d42cd40c69ecfaf10764943d97f1594479ae250687fa279
This commit is contained in:
commit
1c030105d7
|
@ -15,7 +15,7 @@ use crate::p2p::address::Address;
|
||||||
use crate::p2p::ServiceFlags;
|
use crate::p2p::ServiceFlags;
|
||||||
use crate::prelude::{Cow, String};
|
use crate::prelude::{Cow, String};
|
||||||
|
|
||||||
/// Some simple messages
|
// Some simple messages
|
||||||
|
|
||||||
/// The `version` message
|
/// The `version` message
|
||||||
#[derive(PartialEq, Eq, Clone, Debug)]
|
#[derive(PartialEq, Eq, Clone, Debug)]
|
||||||
|
|
|
@ -276,7 +276,7 @@ pub mod hex_bytes {
|
||||||
if let Ok(hex) = core::str::from_utf8(v) {
|
if let Ok(hex) = core::str::from_utf8(v) {
|
||||||
FromHex::from_hex(hex).map_err(E::custom)
|
FromHex::from_hex(hex).map_err(E::custom)
|
||||||
} else {
|
} else {
|
||||||
return Err(E::invalid_value(serde::de::Unexpected::Bytes(v), &self));
|
Err(E::invalid_value(serde::de::Unexpected::Bytes(v), &self))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@ pub mod serde_details {
|
||||||
if let Ok(hex) = str::from_utf8(v) {
|
if let Ok(hex) = str::from_utf8(v) {
|
||||||
hex.parse::<Self::Value>().map_err(E::custom)
|
hex.parse::<Self::Value>().map_err(E::custom)
|
||||||
} else {
|
} else {
|
||||||
return Err(E::invalid_value(de::Unexpected::Bytes(v), &self));
|
Err(E::invalid_value(de::Unexpected::Bytes(v), &self))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/// Support for parsing strings.
|
//! Support for parsing strings.
|
||||||
|
|
||||||
// Impls a single TryFrom conversion
|
// Impls a single TryFrom conversion
|
||||||
#[doc(hidden)]
|
#[doc(hidden)]
|
||||||
|
|
Loading…
Reference in New Issue