Skip to content

Commit 10846df

Browse files
tchardingtcharding
committed
pub(crate) import prelude types
1 parent 7a24f66 commit 10846df

40 files changed

Lines changed: 83 additions & 87 deletions

‎bitcoin/src/address/error.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ use core::fmt;
55
use internals::write_err;
66

77
use crate::address::{Address, NetworkUnchecked};
8-
use crate::prelude::String;
98
use crate::script::{witness_program, witness_version};
10-
use crate::Network;
9+
use crate::{Network, String};
1110

1211
/// Error while generating address from script.
1312
#[derive(Debug, Clone, PartialEq, Eq)]

‎bitcoin/src/address/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ use crate::crypto::key::{
4545
CompressedPublicKey, PubkeyHash, PublicKey, TweakedPublicKey, UntweakedPublicKey,
4646
};
4747
use crate::network::{Network, NetworkKind};
48-
use crate::prelude::{String, ToOwned};
4948
use crate::script::witness_program::WitnessProgram;
5049
use crate::script::witness_version::WitnessVersion;
5150
use crate::script::{
5251
self, RedeemScriptSizeError, Script, ScriptBuf, ScriptHash, WScriptHash, WitnessScriptSizeError,
5352
};
5453
use crate::taproot::TapNodeHash;
54+
use crate::{String, ToOwned};
5555

5656
#[rustfmt::skip] // Keep public re-exports separate.
5757
#[doc(inline)]

‎bitcoin/src/bip152.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ use io::{BufRead, Write};
1414

1515
use crate::consensus::encode::{self, Decodable, Encodable, VarInt};
1616
use crate::internal_macros::{impl_array_newtype_stringify, impl_consensus_encoding};
17-
use crate::prelude::Vec;
18-
use crate::{block, Block, BlockHash, Transaction};
17+
use crate::{block, Block, BlockHash, Transaction, Vec};
1918

2019
/// A BIP-152 error
2120
#[derive(Debug, Clone, PartialEq, Eq)]

‎bitcoin/src/bip158.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ use crate::block::{Block, BlockHash};
4848
use crate::consensus::encode::VarInt;
4949
use crate::consensus::{Decodable, Encodable};
5050
use crate::internal_macros::impl_hashencode;
51-
use crate::prelude::{Borrow, BTreeSet, Vec};
5251
use crate::script::Script;
5352
use crate::transaction::OutPoint;
53+
use crate::{BTreeSet, Borrow, Vec};
5454

5555
/// Golomb encoding parameter as in BIP-158, see also https://gist.github.com/sipa/576d5f09c3b86c3b1b75598d799fc845
5656
const P: u8 = 19;

‎bitcoin/src/bip32.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use secp256k1::{Secp256k1, XOnlyPublicKey};
1717
use crate::crypto::key::{CompressedPublicKey, Keypair, PrivateKey};
1818
use crate::internal_macros::impl_array_newtype_stringify;
1919
use crate::network::NetworkKind;
20-
use crate::prelude::{Vec, String};
20+
use crate::{String, Vec};
2121

2222
/// Version bytes for extended public keys on the Bitcoin network.
2323
const VERSION_BYTES_MAINNET_PUBLIC: [u8; 4] = [0x04, 0x88, 0xB2, 0x1E];

‎bitcoin/src/blockdata/block.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ use crate::consensus::{encode, Decodable, Encodable, Params};
1717
use crate::internal_macros::{impl_consensus_encoding, impl_hashencode};
1818
use crate::merkle_tree::{MerkleNode as _, TxMerkleNode, WitnessMerkleNode};
1919
use crate::pow::{CompactTarget, Target, Work};
20-
use crate::prelude::Vec;
2120
use crate::transaction::{Transaction, Wtxid};
22-
use crate::{script, VarInt};
21+
use crate::{script, VarInt, Vec};
2322

2423
hashes::hash_newtype! {
2524
/// A bitcoin block hash.

‎bitcoin/src/blockdata/opcodes.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use core::fmt;
1212
use internals::debug_from_display;
1313

1414
#[cfg(feature = "serde")]
15-
use crate::prelude::ToString;
15+
use crate::ToString;
1616

1717
/// A script Opcode.
1818
///

‎bitcoin/src/blockdata/script/borrowed.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use core::ops::{
55
Bound, Index, Range, RangeFrom, RangeFull, RangeInclusive, RangeTo, RangeToInclusive,
66
};
77

8+
use hex::DisplayHex;
89
use secp256k1::{Secp256k1, Verification};
910

1011
use super::PushBytes;
@@ -13,14 +14,13 @@ use crate::key::{PublicKey, UntweakedPublicKey, WPubkeyHash};
1314
use crate::opcodes::all::*;
1415
use crate::opcodes::{self, Opcode};
1516
use crate::policy::DUST_RELAY_TX_FEE;
16-
use crate::prelude::{Box, DisplayHex, sink, String, ToOwned, Vec};
1717
use crate::script::witness_version::WitnessVersion;
1818
use crate::script::{
1919
bytes_to_asm_fmt, Builder, Instruction, InstructionIndices, Instructions,
2020
RedeemScriptSizeError, ScriptBuf, ScriptHash, WScriptHash, WitnessScriptSizeError,
2121
};
2222
use crate::taproot::{LeafVersion, TapLeafHash, TapNodeHash};
23-
use crate::FeeRate;
23+
use crate::{sink, Box, FeeRate, String, ToOwned, Vec};
2424

2525
/// Bitcoin script slice.
2626
///

‎bitcoin/src/blockdata/script/builder.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ use crate::key::PublicKey;
88
use crate::locktime::absolute;
99
use crate::opcodes::all::*;
1010
use crate::opcodes::{self, Opcode};
11-
use crate::prelude::Vec;
1211
use crate::script::{opcode_to_verify, write_scriptint, PushBytes, Script, ScriptBuf};
1312
use crate::transaction::Sequence;
13+
use crate::Vec;
1414

1515
/// An Object which can be used to construct a script piece by piece.
1616
#[derive(PartialEq, Eq, Clone)]

‎bitcoin/src/blockdata/script/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@ use core::fmt;
6565
use core::ops::{Deref, DerefMut};
6666

6767
use hashes::{hash160, sha256};
68+
use hex::DisplayHex;
6869
use io::{BufRead, Write};
6970

7071
use crate::consensus::{encode, Decodable, Encodable};
7172
use crate::constants::{MAX_REDEEM_SCRIPT_SIZE, MAX_WITNESS_SCRIPT_SIZE};
7273
use crate::internal_macros::impl_asref_push_bytes;
7374
use crate::opcodes::all::*;
7475
use crate::opcodes::{self, Opcode};
75-
use crate::prelude::{Borrow, BorrowMut, Box, Cow, DisplayHex, ToOwned, Vec};
76-
use crate::OutPoint;
76+
use crate::{Borrow, BorrowMut, Box, Cow, OutPoint, ToOwned, Vec};
7777

7878
#[rustfmt::skip] // Keep public re-exports separate.
7979
#[doc(inline)]

0 commit comments

Comments
 (0)