From b80e5aeaab4bf7e01091620019a2089cd46e0e53 Mon Sep 17 00:00:00 2001
From: "Tobin C. Harding" <me@tobin.cc>
Date: Wed, 8 Jun 2022 14:07:06 +1000
Subject: [PATCH] Re-order import statements

The import statements in `psbt/mod.rs` are a bit of a mess, re-order
them in an attempt to group like things and separate out things that are
different (e.g. `pub use` from `use`).

Refactor only, no logic changes.
---
 bitcoin/src/util/psbt/mod.rs | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/bitcoin/src/util/psbt/mod.rs b/bitcoin/src/util/psbt/mod.rs
index 9ec723c9..56c6dc59 100644
--- a/bitcoin/src/util/psbt/mod.rs
+++ b/bitcoin/src/util/psbt/mod.rs
@@ -9,30 +9,28 @@
 
 use core::cmp;
 
+use crate::prelude::*;
+use crate::io;
+
 use crate::blockdata::script::Script;
 use crate::blockdata::transaction::{ TxOut, Transaction};
 use crate::consensus::{encode, Encodable, Decodable};
+use crate::util::bip32::{ExtendedPubKey, KeySource};
+
 pub use crate::util::sighash::Prevouts;
 
-use crate::prelude::*;
-
-use crate::io;
-mod error;
-pub use self::error::Error;
-
-pub mod raw;
-
 #[macro_use]
 mod macros;
-
+pub mod raw;
 pub mod serialize;
 
+mod error;
+pub use self::error::Error;
+
 mod map;
 pub use self::map::{Input, Output, TapTree, PsbtSighashType, IncompleteTapTree};
 use self::map::Map;
 
-use crate::util::bip32::{ExtendedPubKey, KeySource};
-
 /// Partially signed transaction, commonly referred to as a PSBT.
 pub type Psbt = PartiallySignedTransaction;