From d099b9c19550693e585068edc43ad24ce752bfda Mon Sep 17 00:00:00 2001 From: "Jamil Lambert, PhD" Date: Fri, 21 Jun 2024 17:19:12 +0100 Subject: [PATCH] Remove wildcard from prelude import Wildcards have been replaced with what is actually used. In a couple of cases an additional use statement was added to the test module to import `DisplayHex` which is only used in test, but previously imported with the wildcard at the top. --- bitcoin/src/address/error.rs | 2 +- bitcoin/src/address/mod.rs | 2 +- bitcoin/src/bip152.rs | 2 +- bitcoin/src/bip158.rs | 2 +- bitcoin/src/bip32.rs | 2 +- bitcoin/src/blockdata/block.rs | 2 +- bitcoin/src/blockdata/opcodes.rs | 2 +- bitcoin/src/blockdata/script/borrowed.rs | 2 +- bitcoin/src/blockdata/script/builder.rs | 2 +- bitcoin/src/blockdata/script/mod.rs | 2 +- bitcoin/src/blockdata/script/owned.rs | 2 +- bitcoin/src/blockdata/script/push_bytes.rs | 6 ++---- bitcoin/src/blockdata/transaction.rs | 2 +- bitcoin/src/blockdata/witness.rs | 3 ++- bitcoin/src/consensus/encode.rs | 2 +- bitcoin/src/crypto/ecdsa.rs | 2 +- bitcoin/src/crypto/key.rs | 2 +- bitcoin/src/crypto/sighash.rs | 2 +- bitcoin/src/crypto/taproot.rs | 2 +- bitcoin/src/merkle_tree/block.rs | 4 ++-- bitcoin/src/merkle_tree/mod.rs | 2 +- bitcoin/src/network.rs | 2 +- bitcoin/src/p2p/message.rs | 2 +- bitcoin/src/p2p/message_network.rs | 2 +- bitcoin/src/p2p/mod.rs | 2 +- bitcoin/src/psbt/error.rs | 2 +- bitcoin/src/psbt/map/global.rs | 2 +- bitcoin/src/psbt/map/input.rs | 2 +- bitcoin/src/psbt/map/mod.rs | 2 +- bitcoin/src/psbt/map/output.rs | 2 +- bitcoin/src/psbt/mod.rs | 2 +- bitcoin/src/psbt/raw.rs | 2 +- bitcoin/src/psbt/serialize.rs | 2 +- bitcoin/src/serde_utils.rs | 6 +++--- bitcoin/src/sign_message.rs | 2 +- bitcoin/src/taproot/merkle_branch.rs | 2 +- bitcoin/src/taproot/mod.rs | 4 ++-- hashes/src/hkdf.rs | 2 +- units/src/locktime/absolute.rs | 2 +- 39 files changed, 45 insertions(+), 46 deletions(-) diff --git a/bitcoin/src/address/error.rs b/bitcoin/src/address/error.rs index 5f37fa899..de85ea3d0 100644 --- a/bitcoin/src/address/error.rs +++ b/bitcoin/src/address/error.rs @@ -5,7 +5,7 @@ use core::fmt; use internals::write_err; use crate::address::{Address, NetworkUnchecked}; -use crate::prelude::*; +use crate::prelude::String; use crate::script::{witness_program, witness_version}; use crate::Network; diff --git a/bitcoin/src/address/mod.rs b/bitcoin/src/address/mod.rs index 1bb77e1ab..d322a8ec4 100644 --- a/bitcoin/src/address/mod.rs +++ b/bitcoin/src/address/mod.rs @@ -45,7 +45,7 @@ use crate::crypto::key::{ CompressedPublicKey, PubkeyHash, PublicKey, TweakedPublicKey, UntweakedPublicKey, }; use crate::network::{Network, NetworkKind}; -use crate::prelude::*; +use crate::prelude::{String, ToOwned}; use crate::script::witness_program::WitnessProgram; use crate::script::witness_version::WitnessVersion; use crate::script::{ diff --git a/bitcoin/src/bip152.rs b/bitcoin/src/bip152.rs index f8341ea9f..dbe6426a8 100644 --- a/bitcoin/src/bip152.rs +++ b/bitcoin/src/bip152.rs @@ -14,7 +14,7 @@ use io::{BufRead, Write}; use crate::consensus::encode::{self, Decodable, Encodable, VarInt}; use crate::internal_macros::{impl_array_newtype_stringify, impl_consensus_encoding}; -use crate::prelude::*; +use crate::prelude::Vec; use crate::{block, Block, BlockHash, Transaction}; /// A BIP-152 error diff --git a/bitcoin/src/bip158.rs b/bitcoin/src/bip158.rs index 7501f98e4..b78f252ec 100644 --- a/bitcoin/src/bip158.rs +++ b/bitcoin/src/bip158.rs @@ -48,7 +48,7 @@ use crate::block::{Block, BlockHash}; use crate::consensus::encode::VarInt; use crate::consensus::{Decodable, Encodable}; use crate::internal_macros::impl_hashencode; -use crate::prelude::*; +use crate::prelude::{Borrow, BTreeSet, Vec}; use crate::script::Script; use crate::transaction::OutPoint; diff --git a/bitcoin/src/bip32.rs b/bitcoin/src/bip32.rs index f8ade73aa..4e6b7ac9c 100644 --- a/bitcoin/src/bip32.rs +++ b/bitcoin/src/bip32.rs @@ -16,7 +16,7 @@ use secp256k1::{Secp256k1, XOnlyPublicKey}; use crate::crypto::key::{CompressedPublicKey, Keypair, PrivateKey}; use crate::internal_macros::impl_array_newtype_stringify; use crate::network::NetworkKind; -use crate::prelude::*; +use crate::prelude::{Vec, String}; /// Version bytes for extended public keys on the Bitcoin network. const VERSION_BYTES_MAINNET_PUBLIC: [u8; 4] = [0x04, 0x88, 0xB2, 0x1E]; diff --git a/bitcoin/src/blockdata/block.rs b/bitcoin/src/blockdata/block.rs index ca83df732..edee30eef 100644 --- a/bitcoin/src/blockdata/block.rs +++ b/bitcoin/src/blockdata/block.rs @@ -17,7 +17,7 @@ use crate::consensus::{encode, Decodable, Encodable, Params}; use crate::internal_macros::{impl_consensus_encoding, impl_hashencode}; use crate::merkle_tree::{MerkleNode as _, TxMerkleNode, WitnessMerkleNode}; use crate::pow::{CompactTarget, Target, Work}; -use crate::prelude::*; +use crate::prelude::Vec; use crate::transaction::{Transaction, Wtxid}; use crate::{script, VarInt}; diff --git a/bitcoin/src/blockdata/opcodes.rs b/bitcoin/src/blockdata/opcodes.rs index 5a502d057..5c936d492 100644 --- a/bitcoin/src/blockdata/opcodes.rs +++ b/bitcoin/src/blockdata/opcodes.rs @@ -12,7 +12,7 @@ use core::fmt; use internals::debug_from_display; #[cfg(feature = "serde")] -use crate::prelude::*; +use crate::prelude::ToString; /// A script Opcode. /// diff --git a/bitcoin/src/blockdata/script/borrowed.rs b/bitcoin/src/blockdata/script/borrowed.rs index 6fbeaf32c..dc8d57f3d 100644 --- a/bitcoin/src/blockdata/script/borrowed.rs +++ b/bitcoin/src/blockdata/script/borrowed.rs @@ -13,7 +13,7 @@ use crate::key::{PublicKey, UntweakedPublicKey, WPubkeyHash}; use crate::opcodes::all::*; use crate::opcodes::{self, Opcode}; use crate::policy::DUST_RELAY_TX_FEE; -use crate::prelude::*; +use crate::prelude::{Box, DisplayHex, sink, String, ToOwned, Vec}; use crate::script::witness_version::WitnessVersion; use crate::script::{ bytes_to_asm_fmt, Builder, Instruction, InstructionIndices, Instructions, diff --git a/bitcoin/src/blockdata/script/builder.rs b/bitcoin/src/blockdata/script/builder.rs index 1f53302b5..caf62e9e8 100644 --- a/bitcoin/src/blockdata/script/builder.rs +++ b/bitcoin/src/blockdata/script/builder.rs @@ -8,7 +8,7 @@ use crate::key::PublicKey; use crate::locktime::absolute; use crate::opcodes::all::*; use crate::opcodes::{self, Opcode}; -use crate::prelude::*; +use crate::prelude::Vec; use crate::script::{opcode_to_verify, write_scriptint, PushBytes, Script, ScriptBuf}; use crate::transaction::Sequence; diff --git a/bitcoin/src/blockdata/script/mod.rs b/bitcoin/src/blockdata/script/mod.rs index 4cb001f30..7e04c78c2 100644 --- a/bitcoin/src/blockdata/script/mod.rs +++ b/bitcoin/src/blockdata/script/mod.rs @@ -72,7 +72,7 @@ use crate::constants::{MAX_REDEEM_SCRIPT_SIZE, MAX_WITNESS_SCRIPT_SIZE}; use crate::internal_macros::impl_asref_push_bytes; use crate::opcodes::all::*; use crate::opcodes::{self, Opcode}; -use crate::prelude::*; +use crate::prelude::{Borrow, BorrowMut, Box, Cow, DisplayHex, ToOwned, Vec}; use crate::OutPoint; #[rustfmt::skip] // Keep public re-exports separate. diff --git a/bitcoin/src/blockdata/script/owned.rs b/bitcoin/src/blockdata/script/owned.rs index 38e163de1..0400e80d7 100644 --- a/bitcoin/src/blockdata/script/owned.rs +++ b/bitcoin/src/blockdata/script/owned.rs @@ -11,7 +11,7 @@ use crate::key::{ }; use crate::opcodes::all::*; use crate::opcodes::{self, Opcode}; -use crate::prelude::*; +use crate::prelude::{Box, Vec}; use crate::script::witness_program::WitnessProgram; use crate::script::witness_version::WitnessVersion; use crate::script::{ diff --git a/bitcoin/src/blockdata/script/push_bytes.rs b/bitcoin/src/blockdata/script/push_bytes.rs index fddda74ee..039b2214d 100644 --- a/bitcoin/src/blockdata/script/push_bytes.rs +++ b/bitcoin/src/blockdata/script/push_bytes.rs @@ -4,8 +4,7 @@ use core::ops::{Deref, DerefMut}; -#[allow(unused)] -use crate::prelude::*; +use crate::prelude::{Borrow, BorrowMut}; use crate::script; #[rustfmt::skip] // Keep public re-exports separate. @@ -20,8 +19,7 @@ mod primitive { }; use super::PushBytesError; - #[allow(unused)] - use crate::prelude::*; + use crate::prelude::{ToOwned, Vec}; #[cfg(any(target_pointer_width = "16", target_pointer_width = "32"))] fn check_limit(_: usize) -> Result<(), PushBytesError> { Ok(()) } diff --git a/bitcoin/src/blockdata/transaction.rs b/bitcoin/src/blockdata/transaction.rs index 3e9db5b4b..5a6649de4 100644 --- a/bitcoin/src/blockdata/transaction.rs +++ b/bitcoin/src/blockdata/transaction.rs @@ -22,7 +22,7 @@ use crate::consensus::{encode, Decodable, Encodable}; use crate::internal_macros::{impl_consensus_encoding, impl_hashencode}; use crate::locktime::absolute::{self, Height, Time}; use crate::locktime::relative::{self, TimeOverflowError}; -use crate::prelude::*; +use crate::prelude::{Borrow, Vec}; use crate::script::{Script, ScriptBuf}; #[cfg(doc)] use crate::sighash::{EcdsaSighashType, TapSighashType}; diff --git a/bitcoin/src/blockdata/witness.rs b/bitcoin/src/blockdata/witness.rs index 6054a8434..89bd036e3 100644 --- a/bitcoin/src/blockdata/witness.rs +++ b/bitcoin/src/blockdata/witness.rs @@ -12,7 +12,7 @@ use io::{BufRead, Write}; use crate::consensus::encode::{Error, MAX_VEC_SIZE}; use crate::consensus::{Decodable, Encodable, WriteExt}; use crate::crypto::ecdsa; -use crate::prelude::*; +use crate::prelude::Vec; use crate::taproot::{self, TAPROOT_ANNEX_PREFIX}; use crate::{Script, VarInt}; @@ -561,6 +561,7 @@ mod test { use crate::consensus::{deserialize, serialize}; use crate::sighash::EcdsaSighashType; use crate::Transaction; + use crate::hex::DisplayHex; fn append_u32_vec(mut v: Vec, n: &[u32]) -> Vec { for &num in n { diff --git a/bitcoin/src/consensus/encode.rs b/bitcoin/src/consensus/encode.rs index 10606fde9..52f928d5f 100644 --- a/bitcoin/src/consensus/encode.rs +++ b/bitcoin/src/consensus/encode.rs @@ -31,7 +31,7 @@ use crate::p2p::{ address::{AddrV2Message, Address}, message_blockdata::Inventory, }; -use crate::prelude::*; +use crate::prelude::{Box, Cow, DisplayHex, rc, String, sync, Vec}; use crate::taproot::TapLeafHash; use crate::transaction::{Transaction, TxIn, TxOut}; diff --git a/bitcoin/src/crypto/ecdsa.rs b/bitcoin/src/crypto/ecdsa.rs index 4d26be012..d009e8735 100644 --- a/bitcoin/src/crypto/ecdsa.rs +++ b/bitcoin/src/crypto/ecdsa.rs @@ -11,7 +11,7 @@ use hex::FromHex; use internals::write_err; use io::Write; -use crate::prelude::*; +use crate::prelude::{DisplayHex, Vec}; use crate::script::PushBytes; use crate::sighash::{EcdsaSighashType, NonStandardSighashTypeError}; diff --git a/bitcoin/src/crypto/key.rs b/bitcoin/src/crypto/key.rs index b483ceeeb..89e08c63b 100644 --- a/bitcoin/src/crypto/key.rs +++ b/bitcoin/src/crypto/key.rs @@ -18,7 +18,7 @@ use io::{Read, Write}; use crate::crypto::ecdsa; use crate::internal_macros::impl_asref_push_bytes; use crate::network::NetworkKind; -use crate::prelude::*; +use crate::prelude::{DisplayHex, String, Vec}; use crate::script::ScriptBuf; use crate::taproot::{TapNodeHash, TapTweakHash}; diff --git a/bitcoin/src/crypto/sighash.rs b/bitcoin/src/crypto/sighash.rs index b23d52488..4a2a131a8 100644 --- a/bitcoin/src/crypto/sighash.rs +++ b/bitcoin/src/crypto/sighash.rs @@ -18,7 +18,7 @@ use internals::write_err; use io::Write; use crate::consensus::{encode, Encodable}; -use crate::prelude::*; +use crate::prelude::{Borrow, BorrowMut, String, ToOwned, Vec}; use crate::taproot::{LeafVersion, TapLeafHash, TAPROOT_ANNEX_PREFIX}; use crate::witness::Witness; use crate::{transaction, Amount, Script, ScriptBuf, Sequence, Transaction, TxIn, TxOut}; diff --git a/bitcoin/src/crypto/taproot.rs b/bitcoin/src/crypto/taproot.rs index 1cb8a2882..a6950af2e 100644 --- a/bitcoin/src/crypto/taproot.rs +++ b/bitcoin/src/crypto/taproot.rs @@ -9,7 +9,7 @@ use core::fmt; use internals::write_err; use io::Write; -use crate::prelude::*; +use crate::prelude::Vec; use crate::sighash::{InvalidSighashTypeError, TapSighashType}; use crate::taproot::serialized_signature::{self, SerializedSignature}; diff --git a/bitcoin/src/merkle_tree/block.rs b/bitcoin/src/merkle_tree/block.rs index f791f70f3..917df67ce 100644 --- a/bitcoin/src/merkle_tree/block.rs +++ b/bitcoin/src/merkle_tree/block.rs @@ -17,7 +17,7 @@ use self::MerkleBlockError::*; use crate::block::{self, Block}; use crate::consensus::encode::{self, Decodable, Encodable, MAX_VEC_SIZE}; use crate::merkle_tree::{MerkleNode as _, TxMerkleNode}; -use crate::prelude::*; +use crate::prelude::Vec; use crate::transaction::{Transaction, Txid}; use crate::Weight; @@ -512,7 +512,7 @@ mod tests { use super::*; use crate::consensus::encode; use crate::hash_types::Txid; - use crate::hex::{test_hex_unwrap as hex, FromHex}; + use crate::hex::{test_hex_unwrap as hex, FromHex, DisplayHex}; #[cfg(feature = "rand-std")] macro_rules! pmt_tests { diff --git a/bitcoin/src/merkle_tree/mod.rs b/bitcoin/src/merkle_tree/mod.rs index f4ffaba84..69914d7fa 100644 --- a/bitcoin/src/merkle_tree/mod.rs +++ b/bitcoin/src/merkle_tree/mod.rs @@ -19,7 +19,7 @@ mod block; use hashes::{sha256d, HashEngine as _}; use crate::internal_macros::impl_hashencode; -use crate::prelude::*; +use crate::prelude::Vec; use crate::{Txid, Wtxid}; #[rustfmt::skip] diff --git a/bitcoin/src/network.rs b/bitcoin/src/network.rs index f1b38668a..9ecce282e 100644 --- a/bitcoin/src/network.rs +++ b/bitcoin/src/network.rs @@ -28,7 +28,7 @@ use serde::{Deserialize, Serialize}; use crate::consensus::Params; use crate::constants::ChainHash; use crate::p2p::Magic; -use crate::prelude::*; +use crate::prelude::{String, ToOwned}; /// What kind of network we are on. #[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] diff --git a/bitcoin/src/p2p/message.rs b/bitcoin/src/p2p/message.rs index db925bb6f..9ffcfef7b 100644 --- a/bitcoin/src/p2p/message.rs +++ b/bitcoin/src/p2p/message.rs @@ -17,7 +17,7 @@ use crate::p2p::{ message_blockdata, message_bloom, message_compact_blocks, message_filter, message_network, Magic, }; -use crate::prelude::*; +use crate::prelude::{Box, Cow, String, ToOwned, Vec}; use crate::{block, transaction}; /// The maximum number of [super::message_blockdata::Inventory] items in an `inv` message. diff --git a/bitcoin/src/p2p/message_network.rs b/bitcoin/src/p2p/message_network.rs index 33d54cd46..de9fca2c1 100644 --- a/bitcoin/src/p2p/message_network.rs +++ b/bitcoin/src/p2p/message_network.rs @@ -13,7 +13,7 @@ use crate::internal_macros::impl_consensus_encoding; use crate::p2p; use crate::p2p::address::Address; use crate::p2p::ServiceFlags; -use crate::prelude::*; +use crate::prelude::{Cow, String}; /// Some simple messages diff --git a/bitcoin/src/p2p/mod.rs b/bitcoin/src/p2p/mod.rs index e46c3eaed..8507af733 100644 --- a/bitcoin/src/p2p/mod.rs +++ b/bitcoin/src/p2p/mod.rs @@ -29,7 +29,7 @@ use io::{BufRead, Write}; use crate::consensus::encode::{self, Decodable, Encodable}; use crate::consensus::Params; -use crate::prelude::*; +use crate::prelude::{Borrow, BorrowMut, String, ToOwned}; use crate::Network; #[rustfmt::skip] diff --git a/bitcoin/src/psbt/error.rs b/bitcoin/src/psbt/error.rs index e2665fd32..0bbcdf97e 100644 --- a/bitcoin/src/psbt/error.rs +++ b/bitcoin/src/psbt/error.rs @@ -6,7 +6,7 @@ use internals::write_err; use crate::bip32::Xpub; use crate::consensus::encode; -use crate::prelude::*; +use crate::prelude::Box; use crate::psbt::raw; use crate::transaction::Transaction; diff --git a/bitcoin/src/psbt/map/global.rs b/bitcoin/src/psbt/map/global.rs index 5cd4e7a21..44c6f27e6 100644 --- a/bitcoin/src/psbt/map/global.rs +++ b/bitcoin/src/psbt/map/global.rs @@ -5,7 +5,7 @@ use io::{BufRead, Cursor, Read}; use crate::bip32::{ChildNumber, DerivationPath, Fingerprint, Xpub}; use crate::consensus::encode::MAX_VEC_SIZE; use crate::consensus::{encode, Decodable}; -use crate::prelude::*; +use crate::prelude::{BTreeMap, btree_map, Vec}; use crate::psbt::map::Map; use crate::psbt::{raw, Error, Psbt}; use crate::transaction::Transaction; diff --git a/bitcoin/src/psbt/map/input.rs b/bitcoin/src/psbt/map/input.rs index 79445d797..0d6396d7e 100644 --- a/bitcoin/src/psbt/map/input.rs +++ b/bitcoin/src/psbt/map/input.rs @@ -9,7 +9,7 @@ use secp256k1::XOnlyPublicKey; use crate::bip32::KeySource; use crate::crypto::key::PublicKey; use crate::crypto::{ecdsa, taproot}; -use crate::prelude::*; +use crate::prelude::{Borrow, Box, BTreeMap, btree_map, ToOwned, Vec}; use crate::psbt::map::Map; use crate::psbt::serialize::Deserialize; use crate::psbt::{self, error, raw, Error}; diff --git a/bitcoin/src/psbt/map/mod.rs b/bitcoin/src/psbt/map/mod.rs index f416e5dbb..b086a3e9b 100644 --- a/bitcoin/src/psbt/map/mod.rs +++ b/bitcoin/src/psbt/map/mod.rs @@ -4,7 +4,7 @@ mod global; mod input; mod output; -use crate::prelude::*; +use crate::prelude::Vec; use crate::psbt::raw; use crate::psbt::serialize::Serialize; diff --git a/bitcoin/src/psbt/map/output.rs b/bitcoin/src/psbt/map/output.rs index 841672996..d239d4674 100644 --- a/bitcoin/src/psbt/map/output.rs +++ b/bitcoin/src/psbt/map/output.rs @@ -3,7 +3,7 @@ use secp256k1::XOnlyPublicKey; use crate::bip32::KeySource; -use crate::prelude::*; +use crate::prelude::{BTreeMap, btree_map, Vec}; use crate::psbt::map::Map; use crate::psbt::{raw, Error}; use crate::script::ScriptBuf; diff --git a/bitcoin/src/psbt/mod.rs b/bitcoin/src/psbt/mod.rs index 6398887c3..8d6ad58f7 100644 --- a/bitcoin/src/psbt/mod.rs +++ b/bitcoin/src/psbt/mod.rs @@ -24,7 +24,7 @@ use crate::bip32::{self, KeySource, Xpriv, Xpub}; use crate::crypto::key::{PrivateKey, PublicKey}; use crate::crypto::{ecdsa, taproot}; use crate::key::{TapTweak, XOnlyPublicKey}; -use crate::prelude::*; +use crate::prelude::{Borrow, Box, BTreeMap, BTreeSet, btree_map, Vec}; use crate::sighash::{self, EcdsaSighashType, Prevouts, SighashCache}; use crate::transaction::{self, Transaction, TxOut}; use crate::{Amount, FeeRate, TapLeafHash, TapSighashType}; diff --git a/bitcoin/src/psbt/raw.rs b/bitcoin/src/psbt/raw.rs index e782ca727..a3c4e61f3 100644 --- a/bitcoin/src/psbt/raw.rs +++ b/bitcoin/src/psbt/raw.rs @@ -13,7 +13,7 @@ use super::serialize::{Deserialize, Serialize}; use crate::consensus::encode::{ self, deserialize, serialize, Decodable, Encodable, ReadExt, VarInt, WriteExt, MAX_VEC_SIZE, }; -use crate::prelude::*; +use crate::prelude::{DisplayHex, Vec}; use crate::psbt::Error; /// A PSBT key in its raw byte form. diff --git a/bitcoin/src/psbt/serialize.rs b/bitcoin/src/psbt/serialize.rs index d3659aed6..148fb61bc 100644 --- a/bitcoin/src/psbt/serialize.rs +++ b/bitcoin/src/psbt/serialize.rs @@ -13,7 +13,7 @@ use crate::bip32::{ChildNumber, Fingerprint, KeySource}; use crate::consensus::encode::{self, deserialize_partial, serialize, Decodable, Encodable}; use crate::crypto::key::PublicKey; use crate::crypto::{ecdsa, taproot}; -use crate::prelude::*; +use crate::prelude::{DisplayHex, String, Vec}; use crate::psbt::{Error, Psbt}; use crate::script::ScriptBuf; use crate::taproot::{ diff --git a/bitcoin/src/serde_utils.rs b/bitcoin/src/serde_utils.rs index 7b83ea678..cee25cf00 100644 --- a/bitcoin/src/serde_utils.rs +++ b/bitcoin/src/serde_utils.rs @@ -25,7 +25,7 @@ pub mod btreemap_byte_values { use hex::FromHex; - use crate::prelude::*; + use crate::prelude::BTreeMap; pub fn serialize(v: &BTreeMap>, s: S) -> Result where @@ -92,7 +92,7 @@ pub mod btreemap_as_seq { // NOTE: This module can be exactly copied to use with HashMap. - use crate::prelude::*; + use crate::prelude::BTreeMap; pub fn serialize(v: &BTreeMap, s: S) -> Result where @@ -162,7 +162,7 @@ pub mod btreemap_as_seq_byte_values { // NOTE: This module can be exactly copied to use with HashMap. - use crate::prelude::*; + use crate::prelude::BTreeMap; /// A custom key-value pair type that serialized the bytes as hex. #[derive(Debug, Deserialize)] diff --git a/bitcoin/src/sign_message.rs b/bitcoin/src/sign_message.rs index 635c354a1..a0840ef17 100644 --- a/bitcoin/src/sign_message.rs +++ b/bitcoin/src/sign_message.rs @@ -165,7 +165,7 @@ mod message_signing { use base64::prelude::{Engine as _, BASE64_STANDARD}; use super::*; - use crate::prelude::*; + use crate::prelude::String; impl MessageSignature { /// Convert a signature from base64 encoding. diff --git a/bitcoin/src/taproot/merkle_branch.rs b/bitcoin/src/taproot/merkle_branch.rs index 0e5732669..876931c2d 100644 --- a/bitcoin/src/taproot/merkle_branch.rs +++ b/bitcoin/src/taproot/merkle_branch.rs @@ -8,7 +8,7 @@ use super::{ TapNodeHash, TaprootBuilderError, TaprootError, TAPROOT_CONTROL_MAX_NODE_COUNT, TAPROOT_CONTROL_NODE_SIZE, }; -use crate::prelude::*; +use crate::prelude::{Borrow, BorrowMut, Box, Vec}; /// The merkle proof for inclusion of a tree in a taptree hash. #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Default)] diff --git a/bitcoin/src/taproot/mod.rs b/bitcoin/src/taproot/mod.rs index 74027057f..14c4f7aa6 100644 --- a/bitcoin/src/taproot/mod.rs +++ b/bitcoin/src/taproot/mod.rs @@ -18,7 +18,7 @@ use secp256k1::{Scalar, Secp256k1}; use crate::consensus::Encodable; use crate::crypto::key::{TapTweak, TweakedPublicKey, UntweakedPublicKey, XOnlyPublicKey}; -use crate::prelude::*; +use crate::prelude::{BinaryHeap, BTreeMap, BTreeSet, Vec}; use crate::{Script, ScriptBuf}; // Re-export these so downstream only has to use one `taproot` module. @@ -1454,7 +1454,7 @@ mod test { use hashes::sha256; use hashes::sha256t::Tag; - use hex::FromHex; + use hex::{FromHex, DisplayHex}; use secp256k1::VerifyOnly; use super::*; diff --git a/hashes/src/hkdf.rs b/hashes/src/hkdf.rs index 62ad499ff..92311d4f6 100644 --- a/hashes/src/hkdf.rs +++ b/hashes/src/hkdf.rs @@ -102,7 +102,7 @@ impl Hkdf { #[cfg(test)] #[cfg(feature = "alloc")] mod tests { - use hex::prelude::*; + use hex::prelude::{FromHex, DisplayHex}; use super::*; use crate::sha256; diff --git a/units/src/locktime/absolute.rs b/units/src/locktime/absolute.rs index 81f0df790..64a5094ce 100644 --- a/units/src/locktime/absolute.rs +++ b/units/src/locktime/absolute.rs @@ -10,7 +10,7 @@ use internals::write_err; use crate::parse; use crate::parse::ParseIntError; #[cfg(feature = "alloc")] -use crate::prelude::*; +use crate::prelude::{Box, String}; /// The Threshold for deciding whether a lock time value is a height or a time (see [Bitcoin Core]). ///