Skip to content

Commit 4642021

Browse files
committed
Merge rust-bitcoin#1943: Backport rust-bitcoin#1941 to 0.30.x and release new patch version
99ded54 release 0.30.1 (Andrew Poelstra) b46b61a Use hex_lit::hex in benches (Tobin C. Harding) Pull request description: Needed to unstick rust-bitcoin/rust-miniscript#482 ACKs for top commit: tcharding: ACK 99ded54 sanket1729: utACK 99ded54 Tree-SHA512: d8eeb3203be8d5823a600f4e8066061f27a2eef576f7e979271bf435c4610ed1861b4416254eb52ed2306df250bebca35cec12e8ecaa3779ca12a7b8ddae3a3c
2 parents 3911fc3 + 99ded54 commit 4642021

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

bitcoin/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 0.30.1 - 2023-07-16
2+
3+
- Fix compilation when [`RUSTFLAGS=--cfg=bench` is set](https://github.com/rust-bitcoin/rust-bitcoin/pull/1943)
4+
15
# 0.30 - 2023-03-21 "The First Crate-Smashing Release"
26

37
We now have a website for crates that live under the `rust-bitcoin` GitHub organization: https://rust-bitcoin.org/

bitcoin/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "bitcoin"
3-
version = "0.30.0"
3+
version = "0.30.1"
44
authors = ["Andrew Poelstra <[email protected]>"]
55
license = "CC0-1.0"
66
repository = "https://github.com/rust-bitcoin/rust-bitcoin/"

bitcoin/src/blockdata/transaction.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1910,11 +1910,12 @@ mod tests {
19101910

19111911
#[cfg(bench)]
19121912
mod benches {
1913+
use hex_lit::hex;
1914+
use test::{black_box, Bencher};
1915+
19131916
use super::Transaction;
19141917
use crate::EmptyWrite;
19151918
use crate::consensus::{deserialize, Encodable};
1916-
use crate::internal_macros::hex;
1917-
use test::{black_box, Bencher};
19181919

19191920
const SOME_TX: &str = "0100000001a15d57094aa7a21a28cb20b59aab8fc7d1149a3bdbcddba9c622e4f5f6a99ece010000006c493046022100f93bb0e7d8db7bd46e40132d1f8242026e045f03a0efe71bbb8e3f475e970d790221009337cd7f1f929f00cc6ff01f03729b069a7c21b59b1736ddfee5db5946c5da8c0121033b9b137ee87d5a812d6f506efdd37f0affa7ffc310711c06c7f3e097c9447c52ffffffff0100e1f505000000001976a9140389035a9225b3839e2bbf32d826a1e222031fd888ac00000000";
19201921

0 commit comments

Comments
 (0)