Merge rust-bitcoin/rust-bitcoin#2518: Re-export `address::error::P2shError` from `address` module
0d517dcfdd
Re-export P2shError (Tobin C. Harding)646ee1a837
Put re-exports in alphabetic order (Tobin C. Harding) Pull request description: As with the rest of the errors in `address::error` that are returned by a pubic function from the `address` module. Note please, this PR just makes the `address/mod.rs` file uniform, debating the merit of the re-exports is out of scope. ACKs for top commit: apoelstra: ACK0d517dcfdd
Tree-SHA512: a65ebe6de62b83c6d3723c7c97a0953ddb8da51964ef54e69865855502ae5fa51b2b49c6fd408c452414b56518f4c7ab763faca925e8d81f0fe806af1df92aa2
This commit is contained in:
commit
59a58fdca8
|
@ -50,11 +50,10 @@ use crate::network::{Network, NetworkKind};
|
||||||
use crate::prelude::*;
|
use crate::prelude::*;
|
||||||
use crate::taproot::TapNodeHash;
|
use crate::taproot::TapNodeHash;
|
||||||
|
|
||||||
use self::error::P2shError;
|
|
||||||
#[rustfmt::skip] // Keep public re-exports separate.
|
#[rustfmt::skip] // Keep public re-exports separate.
|
||||||
#[doc(inline)]
|
#[doc(inline)]
|
||||||
pub use self::{
|
pub use self::{
|
||||||
error::{NetworkValidationError, ParseError, UnknownAddressTypeError, UnknownHrpError, FromScriptError, },
|
error::{FromScriptError, NetworkValidationError, ParseError, P2shError, UnknownAddressTypeError, UnknownHrpError},
|
||||||
};
|
};
|
||||||
|
|
||||||
/// The different types of addresses.
|
/// The different types of addresses.
|
||||||
|
|
Loading…
Reference in New Issue