diff --git a/bitcoin/src/amount.rs b/bitcoin/src/amount.rs index 7ca3e708..496245ed 100644 --- a/bitcoin/src/amount.rs +++ b/bitcoin/src/amount.rs @@ -12,7 +12,6 @@ use core::str::FromStr; use core::{default, ops}; use crate::consensus::encode::{self, Decodable, Encodable}; -use crate::io; use crate::prelude::*; /// A set of denominations in which amounts can be expressed. diff --git a/bitcoin/src/bip158.rs b/bitcoin/src/bip158.rs index 34eeb088..13097b7b 100644 --- a/bitcoin/src/bip158.rs +++ b/bitcoin/src/bip158.rs @@ -50,7 +50,6 @@ use crate::blockdata::transaction::OutPoint; use crate::consensus::encode::VarInt; use crate::consensus::{Decodable, Encodable}; use crate::hash_types::{BlockHash, FilterHash, FilterHeader}; -use crate::io; use crate::prelude::*; /// Golomb encoding parameter as in BIP-158, see also https://gist.github.com/sipa/576d5f09c3b86c3b1b75598d799fc845 diff --git a/bitcoin/src/bip32.rs b/bitcoin/src/bip32.rs index 06b0cf98..c1c45597 100644 --- a/bitcoin/src/bip32.rs +++ b/bitcoin/src/bip32.rs @@ -13,6 +13,7 @@ use core::{fmt, slice}; use hashes::{hash160, hash_newtype, sha512, Hash, HashEngine, Hmac, HmacEngine}; use internals::{impl_array_newtype, write_err}; +use io::Write; use secp256k1::{self, Secp256k1, XOnlyPublicKey}; #[cfg(feature = "serde")] use serde; @@ -20,7 +21,6 @@ use serde; use crate::base58; use crate::crypto::key::{self, Keypair, PrivateKey, PublicKey}; use crate::internal_macros::impl_bytes_newtype; -use crate::io::Write; use crate::network::Network; use crate::prelude::*; diff --git a/bitcoin/src/blockdata/block.rs b/bitcoin/src/blockdata/block.rs index 9adde9d8..56649276 100644 --- a/bitcoin/src/blockdata/block.rs +++ b/bitcoin/src/blockdata/block.rs @@ -20,7 +20,7 @@ use crate::hash_types::{TxMerkleNode, WitnessCommitment, WitnessMerkleNode, Wtxi use crate::internal_macros::impl_consensus_encoding; use crate::pow::{CompactTarget, Target, Work}; use crate::prelude::*; -use crate::{io, merkle_tree, Network, VarInt}; +use crate::{merkle_tree, Network, VarInt}; #[rustfmt::skip] // Keep public re-exports separate. #[doc(inline)] @@ -645,9 +645,10 @@ mod tests { mod benches { use test::{black_box, Bencher}; + use io::sink; + use super::Block; use crate::consensus::{deserialize, Decodable, Encodable}; - use crate::io::sink; #[bench] pub fn bench_stream_reader(bh: &mut Bencher) { diff --git a/bitcoin/src/blockdata/locktime/absolute.rs b/bitcoin/src/blockdata/locktime/absolute.rs index fed21aab..4099c2b9 100644 --- a/bitcoin/src/blockdata/locktime/absolute.rs +++ b/bitcoin/src/blockdata/locktime/absolute.rs @@ -10,6 +10,7 @@ use core::cmp::{Ordering, PartialOrd}; use core::{fmt, mem}; use internals::write_err; +use io::{Read, Write}; #[cfg(all(test, mutate))] use mutagen::mutate; @@ -17,7 +18,6 @@ use mutagen::mutate; use crate::absolute; use crate::consensus::encode::{self, Decodable, Encodable}; use crate::error::ParseIntError; -use crate::io::{self, Read, Write}; use crate::parse::{impl_parse_str_from_int_fallible, impl_parse_str_from_int_infallible}; use crate::prelude::*; use crate::string::FromHexStr; diff --git a/bitcoin/src/blockdata/transaction.rs b/bitcoin/src/blockdata/transaction.rs index 9be03354..20146c1e 100644 --- a/bitcoin/src/blockdata/transaction.rs +++ b/bitcoin/src/blockdata/transaction.rs @@ -31,7 +31,7 @@ use crate::script::Push; #[cfg(doc)] use crate::sighash::{EcdsaSighashType, TapSighashType}; use crate::string::FromHexStr; -use crate::{io, Amount, VarInt}; +use crate::{Amount, VarInt}; #[rustfmt::skip] // Keep public re-exports separate. #[cfg(feature = "bitcoinconsensus")] @@ -2207,11 +2207,11 @@ mod tests { #[cfg(bench)] mod benches { use hex_lit::hex; + use io::sink; use test::{black_box, Bencher}; use super::Transaction; use crate::consensus::{deserialize, Encodable}; - use crate::io::sink; const SOME_TX: &str = "0100000001a15d57094aa7a21a28cb20b59aab8fc7d1149a3bdbcddba9c622e4f5f6a99ece010000006c493046022100f93bb0e7d8db7bd46e40132d1f8242026e045f03a0efe71bbb8e3f475e970d790221009337cd7f1f929f00cc6ff01f03729b069a7c21b59b1736ddfee5db5946c5da8c0121033b9b137ee87d5a812d6f506efdd37f0affa7ffc310711c06c7f3e097c9447c52ffffffff0100e1f505000000001976a9140389035a9225b3839e2bbf32d826a1e222031fd888ac00000000"; diff --git a/bitcoin/src/blockdata/witness.rs b/bitcoin/src/blockdata/witness.rs index 920f7345..b7011638 100644 --- a/bitcoin/src/blockdata/witness.rs +++ b/bitcoin/src/blockdata/witness.rs @@ -8,10 +8,11 @@ use core::fmt; use core::ops::Index; +use io::{Read, Write}; + use crate::consensus::encode::{Error, MAX_VEC_SIZE}; use crate::consensus::{Decodable, Encodable, WriteExt}; use crate::crypto::ecdsa; -use crate::io::{self, Read, Write}; use crate::prelude::*; use crate::taproot::TAPROOT_ANNEX_PREFIX; use crate::{Script, VarInt}; diff --git a/bitcoin/src/consensus/encode.rs b/bitcoin/src/consensus/encode.rs index e618c925..7b6a39cb 100644 --- a/bitcoin/src/consensus/encode.rs +++ b/bitcoin/src/consensus/encode.rs @@ -20,12 +20,12 @@ use core::{fmt, mem, u32}; use hashes::{sha256, sha256d, Hash}; use internals::write_err; +use io::{Cursor, Read}; use crate::bip152::{PrefilledTransaction, ShortId}; use crate::blockdata::block; use crate::blockdata::transaction::{Transaction, TxIn, TxOut}; use crate::hash_types::{BlockHash, FilterHash, FilterHeader, TxMerkleNode}; -use crate::io::{self, Cursor, Read}; #[cfg(feature = "std")] use crate::p2p::{ address::{AddrV2Message, Address}, diff --git a/bitcoin/src/consensus/serde.rs b/bitcoin/src/consensus/serde.rs index 9073a32a..98eb0585 100644 --- a/bitcoin/src/consensus/serde.rs +++ b/bitcoin/src/consensus/serde.rs @@ -18,7 +18,6 @@ use serde::{Deserializer, Serializer}; use super::encode::Error as ConsensusError; use super::{Decodable, Encodable}; -use crate::io; /// Hex-encoding strategy pub struct Hex(PhantomData) diff --git a/bitcoin/src/merkle_tree/block.rs b/bitcoin/src/merkle_tree/block.rs index ae880660..caafa4a7 100644 --- a/bitcoin/src/merkle_tree/block.rs +++ b/bitcoin/src/merkle_tree/block.rs @@ -48,7 +48,6 @@ use crate::blockdata::transaction::Transaction; use crate::blockdata::weight::Weight; use crate::consensus::encode::{self, Decodable, Encodable}; use crate::hash_types::{TxMerkleNode, Txid}; -use crate::io; use crate::prelude::*; /// Data structure that represents a block header paired to a partial merkle tree. diff --git a/bitcoin/src/merkle_tree/mod.rs b/bitcoin/src/merkle_tree/mod.rs index 7d75641f..71159a78 100644 --- a/bitcoin/src/merkle_tree/mod.rs +++ b/bitcoin/src/merkle_tree/mod.rs @@ -21,7 +21,6 @@ use core::iter; use hashes::Hash; use crate::consensus::encode::Encodable; -use crate::io; use crate::prelude::*; #[rustfmt::skip] diff --git a/bitcoin/src/p2p/address.rs b/bitcoin/src/p2p/address.rs index 5e470551..bb7c9a07 100644 --- a/bitcoin/src/p2p/address.rs +++ b/bitcoin/src/p2p/address.rs @@ -10,7 +10,6 @@ use core::{fmt, iter}; use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs}; use crate::consensus::encode::{self, Decodable, Encodable, ReadExt, VarInt, WriteExt}; -use crate::io; use crate::p2p::ServiceFlags; use crate::prelude::*; diff --git a/bitcoin/src/p2p/message.rs b/bitcoin/src/p2p/message.rs index 457957f3..f12dcb4f 100644 --- a/bitcoin/src/p2p/message.rs +++ b/bitcoin/src/p2p/message.rs @@ -12,7 +12,6 @@ use hashes::{sha256d, Hash}; use crate::blockdata::{block, transaction}; use crate::consensus::encode::{self, CheckedData, Decodable, Encodable, VarInt}; -use crate::io; use crate::merkle_tree::MerkleBlock; use crate::p2p::address::{AddrV2Message, Address}; use crate::p2p::{ diff --git a/bitcoin/src/p2p/message_bloom.rs b/bitcoin/src/p2p/message_bloom.rs index 812ce2f5..fa62a89a 100644 --- a/bitcoin/src/p2p/message_bloom.rs +++ b/bitcoin/src/p2p/message_bloom.rs @@ -7,7 +7,6 @@ use crate::consensus::{encode, Decodable, Encodable, ReadExt}; use crate::internal_macros::impl_consensus_encoding; -use crate::io; /// `filterload` message sets the current bloom filter #[derive(Clone, PartialEq, Eq, Debug)] diff --git a/bitcoin/src/pow.rs b/bitcoin/src/pow.rs index 9387bb4f..b59f35e1 100644 --- a/bitcoin/src/pow.rs +++ b/bitcoin/src/pow.rs @@ -9,6 +9,7 @@ use core::fmt::{self, LowerHex, UpperHex}; use core::ops::{Add, Div, Mul, Not, Rem, Shl, Shr, Sub}; +use io::{Read, Write}; #[cfg(all(test, mutate))] use mutagen::mutate; @@ -16,7 +17,6 @@ use crate::consensus::encode::{self, Decodable, Encodable}; #[cfg(doc)] use crate::consensus::Params; use crate::hash_types::BlockHash; -use crate::io::{self, Read, Write}; use crate::prelude::String; use crate::string::FromHexStr; use crate::Network; diff --git a/bitcoin/src/psbt/map/global.rs b/bitcoin/src/psbt/map/global.rs index 53c33c6e..cc50ef06 100644 --- a/bitcoin/src/psbt/map/global.rs +++ b/bitcoin/src/psbt/map/global.rs @@ -1,10 +1,11 @@ // SPDX-License-Identifier: CC0-1.0 +use io::{Cursor, Read}; + use crate::bip32::{ChildNumber, DerivationPath, Fingerprint, Xpub}; use crate::blockdata::transaction::Transaction; use crate::consensus::encode::MAX_VEC_SIZE; use crate::consensus::{encode, Decodable}; -use crate::io::{self, Cursor, Read}; use crate::prelude::*; use crate::psbt::map::Map; use crate::psbt::{raw, Error, Psbt}; diff --git a/bitcoin/src/psbt/raw.rs b/bitcoin/src/psbt/raw.rs index c52a70fe..cc48168f 100644 --- a/bitcoin/src/psbt/raw.rs +++ b/bitcoin/src/psbt/raw.rs @@ -12,7 +12,6 @@ use super::serialize::{Deserialize, Serialize}; use crate::consensus::encode::{ self, deserialize, serialize, Decodable, Encodable, ReadExt, VarInt, WriteExt, MAX_VEC_SIZE, }; -use crate::io; use crate::prelude::*; use crate::psbt::Error;