From 646ee1a8370d96db7b06ec5a3e7320bd64fcfc19 Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Thu, 29 Feb 2024 09:43:43 +1100 Subject: [PATCH 1/2] Put re-exports in alphabetic order We skip formatting of public re-exports; manually format the re-exports by putting the types in alphabetic order. --- bitcoin/src/address/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitcoin/src/address/mod.rs b/bitcoin/src/address/mod.rs index a3cae064..ff273761 100644 --- a/bitcoin/src/address/mod.rs +++ b/bitcoin/src/address/mod.rs @@ -54,7 +54,7 @@ use self::error::P2shError; #[rustfmt::skip] // Keep public re-exports separate. #[doc(inline)] pub use self::{ - error::{NetworkValidationError, ParseError, UnknownAddressTypeError, UnknownHrpError, FromScriptError, }, + error::{FromScriptError, NetworkValidationError, ParseError, UnknownAddressTypeError, UnknownHrpError}, }; /// The different types of addresses. From 0d517dcfdd8119a175d7c2c119ca51d2beb77970 Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Thu, 29 Feb 2024 09:44:50 +1100 Subject: [PATCH 2/2] Re-export P2shError The `address` module is currently publicly re-exporting all error types that appear as return values for any pubic function, except for the `P2shError` - we should be uniform. This re-export of error thing has not been discussed/agreed upon as a policy but I have been doing it for the last few months anytime I introduced an `error` module - there has been no push back so I assumed it was acceptable. Before 1.0 we should probably have a policy on this. --- bitcoin/src/address/mod.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bitcoin/src/address/mod.rs b/bitcoin/src/address/mod.rs index ff273761..64585902 100644 --- a/bitcoin/src/address/mod.rs +++ b/bitcoin/src/address/mod.rs @@ -50,11 +50,10 @@ use crate::network::{Network, NetworkKind}; use crate::prelude::*; use crate::taproot::TapNodeHash; -use self::error::P2shError; #[rustfmt::skip] // Keep public re-exports separate. #[doc(inline)] pub use self::{ - error::{FromScriptError, NetworkValidationError, ParseError, UnknownAddressTypeError, UnknownHrpError}, + error::{FromScriptError, NetworkValidationError, ParseError, P2shError, UnknownAddressTypeError, UnknownHrpError}, }; /// The different types of addresses.