milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Use `io::Error::get_ref()` over `std::error::Error::source()`

This commit is contained in:
Matt Corallo 2023-09-15 03:46:27 +00:00
parent 3caaadf9bb
commit 9e1cd372cb
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bitcoin/src/consensus/serde.rs
View File

@ -174,10 +174,8 @@ impl<'a, T: 'a + Encodable, E: ByteEncoder> fmt::Display for DisplayWrapper<'a,
self.0.consensus_encode(&mut writer).map_err(|error| { self.0.consensus_encode(&mut writer).map_err(|error| {
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
{ {
use crate::StdError;
if error.kind() != io::ErrorKind::Other if error.kind() != io::ErrorKind::Other
|| error.source().is_some() || error.get_ref().is_some()
|| !writer.writer.was_error || !writer.writer.was_error
{ {
panic!( panic!(
@ -429,8 +427,6 @@ impl<E: fmt::Debug, I: Iterator<Item = Result<u8, E>>> IterReader<E, I> {
fn new(iterator: I) -> Self { IterReader { iterator: iterator.fuse(), error: None } } fn new(iterator: I) -> Self { IterReader { iterator: iterator.fuse(), error: None } }
fn decode<T: Decodable>(mut self) -> Result<T, DecodeError<E>> { fn decode<T: Decodable>(mut self) -> Result<T, DecodeError<E>> {
use crate::StdError;
let result = T::consensus_decode(&mut self); let result = T::consensus_decode(&mut self);
match (result, self.error) { match (result, self.error) {
(Ok(_), None) if self.iterator.next().is_some() => { (Ok(_), None) if self.iterator.next().is_some() => {
@ -438,7 +434,7 @@ impl<E: fmt::Debug, I: Iterator<Item = Result<u8, E>>> IterReader<E, I> {
}, },
(Ok(value), None) => Ok(value), (Ok(value), None) => Ok(value),
(Ok(_), Some(error)) => panic!("{} silently ate the error: {:?}", core::any::type_name::<T>(), error), (Ok(_), Some(error)) => panic!("{} silently ate the error: {:?}", core::any::type_name::<T>(), error),
(Err(ConsensusError::Io(io_error)), Some(de_error)) if io_error.kind() == io::ErrorKind::Other && io_error.source().is_none() => Err(DecodeError::Other(de_error)), (Err(ConsensusError::Io(io_error)), Some(de_error)) if io_error.kind() == io::ErrorKind::Other && io_error.get_ref().is_none() => Err(DecodeError::Other(de_error)),
(Err(consensus_error), None) => Err(DecodeError::Consensus(consensus_error)), (Err(consensus_error), None) => Err(DecodeError::Consensus(consensus_error)),
(Err(ConsensusError::Io(io_error)), de_error) => panic!("Unexpected IO error {:?} returned from {}::consensus_decode(), deserialization error: {:?}", io_error, core::any::type_name::<T>(), de_error), (Err(ConsensusError::Io(io_error)), de_error) => panic!("Unexpected IO error {:?} returned from {}::consensus_decode(), deserialization error: {:?}", io_error, core::any::type_name::<T>(), de_error),
(Err(consensus_error), Some(de_error)) => panic!("{} should've returned `Other` IO error because of deserialization error {:?} but it returned consensus error {:?} instead", core::any::type_name::<T>(), de_error, consensus_error), (Err(consensus_error), Some(de_error)) => panic!("{} should've returned `Other` IO error because of deserialization error {:?} but it returned consensus error {:?} instead", core::any::type_name::<T>(), de_error, consensus_error),
@ -494,8 +490,6 @@ impl<E> With<E> {
if serializer.is_human_readable() { if serializer.is_human_readable() {
serializer.collect_str(&DisplayWrapper::<'_, _, E>(value, Default::default())) serializer.collect_str(&DisplayWrapper::<'_, _, E>(value, Default::default()))
} else { } else {
use crate::StdError;
let serializer = serializer.serialize_seq(None)?; let serializer = serializer.serialize_seq(None)?;
let mut writer = BinWriter { serializer, error: None }; let mut writer = BinWriter { serializer, error: None };
@ -505,7 +499,7 @@ impl<E> With<E> {
(Ok(_), Some(error)) => (Ok(_), Some(error)) =>
panic!("{} silently ate an IO error: {:?}", core::any::type_name::<T>(), error), panic!("{} silently ate an IO error: {:?}", core::any::type_name::<T>(), error),
(Err(io_error), Some(ser_error)) (Err(io_error), Some(ser_error))
if io_error.kind() == io::ErrorKind::Other && io_error.source().is_none() => if io_error.kind() == io::ErrorKind::Other && io_error.get_ref().is_none() =>
Err(ser_error), Err(ser_error),
(Err(io_error), ser_error) => panic!( (Err(io_error), ser_error) => panic!(
"{} returned an unexpected IO error: {:?} serialization error: {:?}", "{} returned an unexpected IO error: {:?} serialization error: {:?}",

3
bitcoin/src/lib.rs
View File

@ -113,9 +113,6 @@ pub mod sign_message;
pub mod string; pub mod string;
pub mod taproot; pub mod taproot;
// May depend on crate features and we don't want to bother with it
#[allow(unused)]
use bitcoin_io::error::Error as StdError;
use bitcoin_io::io; use bitcoin_io::io;
pub use crate::address::{Address, AddressType}; pub use crate::address::{Address, AddressType};