Skip to content

Commit e376e90

Browse files
committed
Merge rust-bitcoin#2620: bitcoin: Depend on and export hex-conservative
8273b80 bitcoin: Depend on and export hex-conservative (Tobin C. Harding) Pull request description: When we did the `rust-bitcoin v0.30.0` release we had not yet released the `hex-conservative` crate so we forced users to reach into `bitcoin-internals` to get at hex stuff e.g., `DisplayHex`. To ease the upgrade path for any remaining upgraders add a dependency on the now released `hex-conservative` crate and re-export it from the crate root as `hex` (bit late I know, sorry). Idea came from: rust-bitcoin#2482 (comment) We should have done this soon as we released `hex-conservative`. ACKs for top commit: apoelstra: utACK 8273b80 -- tested `cargo test` at least Tree-SHA512: 6c2cd137f9e5d00fb2ecfb35ce368b4555ece81a360e02770090870dd79f8fa8cf22f600399a9311bddeb433e752d387bef1dd5721cf0823bced5895e17e662e
2 parents 4b6b55f + 8273b80 commit e376e90

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

bitcoin/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ bitcoin-internals = { path = "../internals", package = "bitcoin-private", versio
3838
bech32 = { version = "0.9.0", default-features = false }
3939
bitcoin_hashes = { version = "0.12.0", default-features = false }
4040
secp256k1 = { version = "0.27.0", default-features = false, features = ["bitcoin_hashes"] }
41+
hex = { package = "hex-conservative", version = "0.2.0", default-features = false, features = ["alloc"] }
4142
hex_lit = "0.1.1"
4243

4344
base64 = { version = "0.13.0", optional = true }

bitcoin/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ pub extern crate bitcoin_hashes as hashes;
6464
#[cfg(feature = "bitcoinconsensus")]
6565
#[cfg_attr(docsrs, doc(cfg(feature = "bitcoinconsensus")))]
6666
pub extern crate bitcoinconsensus;
67+
pub extern crate hex;
6768
pub extern crate secp256k1;
6869

6970
#[cfg(feature = "serde")]

0 commit comments

Comments
 (0)