From 7f289a9fdf86604cc1ecfb31c6df0ea5bb175465 Mon Sep 17 00:00:00 2001 From: Leo Nash Date: Thu, 31 Oct 2024 01:43:37 +0000 Subject: [PATCH] Bump hex-conservative to 0.3.0 --- Cargo-minimal.lock | 23 ++++++++++++++++------- Cargo-recent.lock | 23 ++++++++++++++++------- base58/Cargo.toml | 2 +- bitcoin/Cargo.toml | 2 +- bitcoin/src/consensus/serde.rs | 4 ++-- chacha20_poly1305/Cargo.toml | 2 +- hashes/Cargo.toml | 2 +- internals/Cargo.toml | 2 +- primitives/Cargo.toml | 2 +- 9 files changed, 40 insertions(+), 22 deletions(-) diff --git a/Cargo-minimal.lock b/Cargo-minimal.lock index 73f21f467..8ff8f0963 100644 --- a/Cargo-minimal.lock +++ b/Cargo-minimal.lock @@ -26,7 +26,7 @@ version = "0.1.0" dependencies = [ "bitcoin-internals", "bitcoin_hashes 0.15.0", - "hex-conservative", + "hex-conservative 0.3.0", ] [[package]] @@ -66,7 +66,7 @@ dependencies = [ "bitcoin-units", "bitcoin_hashes 0.15.0", "bitcoinconsensus", - "hex-conservative", + "hex-conservative 0.3.0", "hex_lit", "mutagen", "ordered", @@ -95,7 +95,7 @@ name = "bitcoin-internals" version = "0.4.0" dependencies = [ "bincode", - "hex-conservative", + "hex-conservative 0.3.0", "serde", "serde_json", ] @@ -117,7 +117,7 @@ dependencies = [ "bitcoin-io", "bitcoin-units", "bitcoin_hashes 0.15.0", - "hex-conservative", + "hex-conservative 0.3.0", "mutagen", "ordered", "serde", @@ -141,7 +141,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" dependencies = [ - "hex-conservative", + "hex-conservative 0.2.0", ] [[package]] @@ -149,7 +149,7 @@ name = "bitcoin_hashes" version = "0.15.0" dependencies = [ "bitcoin-io", - "hex-conservative", + "hex-conservative 0.3.0", "serde", "serde_json", "serde_test", @@ -186,7 +186,7 @@ checksum = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de" name = "chacha20-poly1305" version = "0.1.0" dependencies = [ - "hex-conservative", + "hex-conservative 0.3.0", ] [[package]] @@ -209,6 +209,15 @@ dependencies = [ "arrayvec", ] +[[package]] +name = "hex-conservative" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afe881d0527571892c4034822e59bb10c6c991cce6abe8199b6f5cf10766f55" +dependencies = [ + "arrayvec", +] + [[package]] name = "hex_lit" version = "0.1.1" diff --git a/Cargo-recent.lock b/Cargo-recent.lock index 0cc3f3b5d..3f202d368 100644 --- a/Cargo-recent.lock +++ b/Cargo-recent.lock @@ -26,7 +26,7 @@ version = "0.1.0" dependencies = [ "bitcoin-internals", "bitcoin_hashes 0.15.0", - "hex-conservative", + "hex-conservative 0.3.0", ] [[package]] @@ -65,7 +65,7 @@ dependencies = [ "bitcoin-units", "bitcoin_hashes 0.15.0", "bitcoinconsensus", - "hex-conservative", + "hex-conservative 0.3.0", "hex_lit", "mutagen", "ordered", @@ -94,7 +94,7 @@ name = "bitcoin-internals" version = "0.4.0" dependencies = [ "bincode", - "hex-conservative", + "hex-conservative 0.3.0", "serde", "serde_json", ] @@ -116,7 +116,7 @@ dependencies = [ "bitcoin-io", "bitcoin-units", "bitcoin_hashes 0.15.0", - "hex-conservative", + "hex-conservative 0.3.0", "mutagen", "ordered", "serde", @@ -140,7 +140,7 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" dependencies = [ - "hex-conservative", + "hex-conservative 0.2.1", ] [[package]] @@ -148,7 +148,7 @@ name = "bitcoin_hashes" version = "0.15.0" dependencies = [ "bitcoin-io", - "hex-conservative", + "hex-conservative 0.3.0", "serde", "serde_json", "serde_test", @@ -188,7 +188,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" name = "chacha20-poly1305" version = "0.1.0" dependencies = [ - "hex-conservative", + "hex-conservative 0.3.0", ] [[package]] @@ -211,6 +211,15 @@ dependencies = [ "arrayvec", ] +[[package]] +name = "hex-conservative" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4afe881d0527571892c4034822e59bb10c6c991cce6abe8199b6f5cf10766f55" +dependencies = [ + "arrayvec", +] + [[package]] name = "hex_lit" version = "0.1.1" diff --git a/base58/Cargo.toml b/base58/Cargo.toml index 70072305d..198b91bf4 100644 --- a/base58/Cargo.toml +++ b/base58/Cargo.toml @@ -22,7 +22,7 @@ hashes = { package = "bitcoin_hashes", version = "0.15.0", default-features = fa internals = { package = "bitcoin-internals", version = "0.4.0" } [dev-dependencies] -hex = { package = "hex-conservative", version = "0.2.0", default-features = false, features = ["alloc"] } +hex = { package = "hex-conservative", version = "0.3.0", default-features = false, features = ["alloc"] } [package.metadata.docs.rs] all-features = true diff --git a/bitcoin/Cargo.toml b/bitcoin/Cargo.toml index 65e04ed54..ff078247a 100644 --- a/bitcoin/Cargo.toml +++ b/bitcoin/Cargo.toml @@ -28,7 +28,7 @@ arbitrary = ["dep:arbitrary", "units/arbitrary", "primitives/arbitrary"] base58 = { package = "base58ck", version = "0.1.0", default-features = false, features = ["alloc"] } bech32 = { version = "0.11.0", default-features = false, features = ["alloc"] } hashes = { package = "bitcoin_hashes", version = "0.15.0", default-features = false, features = ["alloc", "bitcoin-io"] } -hex = { package = "hex-conservative", version = "0.2.0", default-features = false, features = ["alloc"] } +hex = { package = "hex-conservative", version = "0.3.0", default-features = false, features = ["alloc"] } internals = { package = "bitcoin-internals", version = "0.4.0", features = ["alloc"] } io = { package = "bitcoin-io", version = "0.2.0", default-features = false, features = ["alloc"] } primitives = { package = "bitcoin-primitives", version = "0.100.0", default-features = false, features = ["alloc"] } diff --git a/bitcoin/src/consensus/serde.rs b/bitcoin/src/consensus/serde.rs index fa5253e38..32f9d417f 100644 --- a/bitcoin/src/consensus/serde.rs +++ b/bitcoin/src/consensus/serde.rs @@ -74,7 +74,7 @@ pub mod hex { pub struct Encoder(BufEncoder<{ HEX_BUF_SIZE }>, PhantomData); impl From> for Encoder { - fn from(_: super::Hex) -> Self { Encoder(BufEncoder::new(), Default::default()) } + fn from(_: super::Hex) -> Self { Encoder(BufEncoder::new(C::INTERNAL_CASE), Default::default()) } } impl super::EncodeBytes for Encoder { @@ -83,7 +83,7 @@ pub mod hex { if self.0.is_full() { self.flush(writer)?; } - bytes = self.0.put_bytes_min(bytes, C::INTERNAL_CASE); + bytes = self.0.put_bytes_min(bytes); } Ok(()) } diff --git a/chacha20_poly1305/Cargo.toml b/chacha20_poly1305/Cargo.toml index 3df491b99..b6b5752e5 100644 --- a/chacha20_poly1305/Cargo.toml +++ b/chacha20_poly1305/Cargo.toml @@ -17,7 +17,7 @@ std = ["alloc"] alloc = [] [dev-dependencies] -hex = { package = "hex-conservative", version = "0.2.0", default-features = false, features = ["alloc"] } +hex = { package = "hex-conservative", version = "0.3.0", default-features = false, features = ["alloc"] } [package.metadata.docs.rs] all-features = true diff --git a/hashes/Cargo.toml b/hashes/Cargo.toml index 660c0c9d3..1553f7882 100644 --- a/hashes/Cargo.toml +++ b/hashes/Cargo.toml @@ -21,7 +21,7 @@ alloc = ["bitcoin-io?/alloc", "hex/alloc"] small-hash = [] [dependencies] -hex = { package = "hex-conservative", version = "0.2.0", default-features = false } +hex = { package = "hex-conservative", version = "0.3.0", default-features = false } bitcoin-io = { version = "0.2.0", default-features = false, optional = true } serde = { version = "1.0", default-features = false, optional = true } diff --git a/internals/Cargo.toml b/internals/Cargo.toml index feb14cde0..3682e4797 100644 --- a/internals/Cargo.toml +++ b/internals/Cargo.toml @@ -21,7 +21,7 @@ alloc = ["hex/alloc"] test-serde = ["serde", "serde_json", "bincode"] [dependencies] -hex = { package = "hex-conservative", version = "0.2.0", default-features = false } +hex = { package = "hex-conservative", version = "0.3.0", default-features = false } serde = { version = "1.0.103", default-features = false, optional = true } # Don't enable these directly, use `test-serde` feature instead. diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml index 4bc7d92c4..1387fc1d9 100644 --- a/primitives/Cargo.toml +++ b/primitives/Cargo.toml @@ -23,7 +23,7 @@ arbitrary = ["dep:arbitrary", "units/arbitrary"] [dependencies] hashes = { package = "bitcoin_hashes", version = "0.15.0", default-features = false, features = ["bitcoin-io"] } -hex = { package = "hex-conservative", version = "0.2.0", default-features = false } +hex = { package = "hex-conservative", version = "0.3.0", default-features = false } internals = { package = "bitcoin-internals", version = "0.4.0" } io = { package = "bitcoin-io", version = "0.2.0", default-features = false } units = { package = "bitcoin-units", version = "0.2.0", default-features = false }