Merge rust-bitcoin#5362: Release tracking PR: primitives v1.0.0-rc.1

apoelstra · apoelstra · commit fa1e5b5383e8 · 2025-12-10T14:52:14.000Z
e66eea5 Release tracking PR: `primitives v1.0.0-rc.1` (Tobin C. Harding) 52749bf bitcoin: Remove call to deprecated function (Tobin C. Harding) 64c9298 primitives: Remove deprecated type from API test (Tobin C. Harding) 55a00ae Pin all RC dependencies (Tobin C. Harding) Pull request description: Do another RC round. (Note I did not check if anything needs to go in the changelog because we will need to do so before the 1.0 anyways.) ACKs for top commit: apoelstra: ACK e66eea5; successfully ran local tests Tree-SHA512: 519457680b0df5d6d8ec93aa2c38c6147f7f3c1a3fec3013f68d99c310742e8d6c680dd95db897307dc65a7b8962de89425446e39259672199cb393621d16a50
diff --git a/Cargo-minimal.lock b/Cargo-minimal.lock
@@ -138,7 +138,7 @@ dependencies = [
 
 [[package]]
 name = "bitcoin-primitives"
-version = "1.0.0-rc.0"
+version = "1.0.0-rc.1"
 dependencies = [
  "arbitrary",
  "arrayvec",
diff --git a/Cargo-recent.lock b/Cargo-recent.lock
@@ -137,7 +137,7 @@ dependencies = [
 
 [[package]]
 name = "bitcoin-primitives"
-version = "1.0.0-rc.0"
+version = "1.0.0-rc.1"
 dependencies = [
  "arbitrary",
  "arrayvec",
diff --git a/bitcoin/Cargo.toml b/bitcoin/Cargo.toml
@@ -31,9 +31,9 @@ hashes = { package = "bitcoin_hashes", path = "../hashes", version = "0.18.0", d
 hex = { package = "hex-conservative", version = "0.3.0", default-features = false, features = ["alloc"] }
 internals = { package = "bitcoin-internals", path = "../internals", version = "0.4.2", features = ["alloc", "hex"] }
 io = { package = "bitcoin-io", path = "../io", version = "0.3.0", default-features = false, features = ["alloc", "hashes"] }
-primitives = { package = "bitcoin-primitives", path = "../primitives", version = "1.0.0-rc.0", default-features = false, features = ["alloc", "hex"] }
+primitives = { package = "bitcoin-primitives", path = "../primitives", version = "=1.0.0-rc.1", default-features = false, features = ["alloc", "hex"] }
 secp256k1 = { version = "0.32.0-beta.2", default-features = false, features = ["alloc"] }
-units = { package = "bitcoin-units", path = "../units", version = "1.0.0-rc.3", default-features = false, features = ["alloc"] }
+units = { package = "bitcoin-units", path = "../units", version = "=1.0.0-rc.3", default-features = false, features = ["alloc"] }
 
 arbitrary = { version = "1.4.1", optional = true }
 base64 = { version = "0.22.0", optional = true, default-features = false, features = ["alloc"] }
diff --git a/bitcoin/examples/script.rs b/bitcoin/examples/script.rs
@@ -77,7 +77,7 @@ fn main() {
     assert_eq!(decoded, script_code);
 
     // to/from bytes excludes the prefix, these are not encoding/decoding functions so this is sane.
-    let bytes = script_code.to_bytes();
+    let bytes = script_code.to_vec();
     let got = WitnessScriptBuf::from_bytes(bytes);
     assert_eq!(got, script_code);
 }
diff --git a/hashes/Cargo.toml b/hashes/Cargo.toml
@@ -23,7 +23,7 @@ small-hash = []
 
 [dependencies]
 internals = { package = "bitcoin-internals", path = "../internals", version = "0.4.1" }
-encoding = { package = "bitcoin-consensus-encoding", path = "../consensus_encoding", version = "1.0.0-rc.2", default-features = false }
+encoding = { package = "bitcoin-consensus-encoding", path = "../consensus_encoding", version = "=1.0.0-rc.2", default-features = false }
 
 hex = { package = "hex-conservative", version = "0.3.0", default-features = false, optional = true }
 serde = { version = "1.0.195", default-features = false, optional = true }
diff --git a/io/Cargo.toml b/io/Cargo.toml
@@ -20,7 +20,7 @@ alloc = ["encoding/alloc", "hashes?/alloc", "internals/alloc"]
 
 [dependencies]
 internals = { package = "bitcoin-internals", path = "../internals", version = "0.4.1" }
-encoding = { package = "bitcoin-consensus-encoding", path = "../consensus_encoding", version = "1.0.0-rc.2", default-features = false }
+encoding = { package = "bitcoin-consensus-encoding", path = "../consensus_encoding", version = "=1.0.0-rc.2", default-features = false }
 
 hashes = { package = "bitcoin_hashes", path = "../hashes", version = "0.18.0", default-features = false, optional = true }
 
diff --git a/p2p/Cargo.toml b/p2p/Cargo.toml
@@ -19,12 +19,12 @@ arbitrary = ["dep:arbitrary", "bitcoin/arbitrary"]
 
 [dependencies]
 bitcoin = { path = "../bitcoin/", default-features = false }
-encoding = { package = "bitcoin-consensus-encoding", version = "1.0.0-rc.1", path = "../consensus_encoding", default-features = false }
+encoding = { package = "bitcoin-consensus-encoding", version = "=1.0.0-rc.2", path = "../consensus_encoding", default-features = false }
 hashes = { package = "bitcoin_hashes", version = "0.18.0", path = "../hashes", default-features = false }
 hex = { package = "hex-conservative", version = "0.3.0", default-features = false }
 internals = { package = "bitcoin-internals", path = "../internals", default-features = false }
 io = { package = "bitcoin-io", path = "../io", default-features = false }
-units = { package = "bitcoin-units", path = "../units", version = "1.0.0-rc.3", default-features = false }
+units = { package = "bitcoin-units", path = "../units", version = "=1.0.0-rc.3", default-features = false }
 
 arbitrary = { version = "1.4.1", optional = true }
 
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bitcoin-primitives"
-version = "1.0.0-rc.0"
+version = "1.0.0-rc.1"
 authors = ["Andrew Poelstra <apoelstra@wpsoftware.net>", "Tobin C. Harding <me@tobin.cc>"]
 license = "CC0-1.0"
 repository = "https://github.com/rust-bitcoin/rust-bitcoin"
@@ -21,10 +21,10 @@ arbitrary = ["dep:arbitrary", "units/arbitrary"]
 hex = ["dep:hex-stable", "dep:hex-unstable", "hashes/hex", "internals/hex"]
 
 [dependencies]
-encoding = { package = "bitcoin-consensus-encoding", path = "../consensus_encoding", version = "1.0.0-rc.1", default-features = false }
+encoding = { package = "bitcoin-consensus-encoding", path = "../consensus_encoding", version = "=1.0.0-rc.2", default-features = false }
 hashes = { package = "bitcoin_hashes", path = "../hashes", version = "0.18.0", default-features = false }
 internals = { package = "bitcoin-internals", path = "../internals", version = "0.4.1" }
-units = { package = "bitcoin-units", path = "../units", version = "1.0.0-rc.3", default-features = false, features = [ "encoding" ] }
+units = { package = "bitcoin-units", path = "../units", version = "=1.0.0-rc.3", default-features = false, features = [ "encoding" ] }
 arrayvec = { version = "0.7.2", default-features = false }
 
 arbitrary = { version = "1.4.1", optional = true }
diff --git a/primitives/src/lib.rs b/primitives/src/lib.rs
@@ -67,7 +67,7 @@ pub use units::{
     weight::{self, Weight},
 };
 
-#[deprecated(since = "TBD", note = "use `BlockHeightInterval` instead")]
+#[deprecated(since = "1.0.0-rc.0", note = "use `BlockHeightInterval` instead")]
 #[doc(hidden)]
 pub type BlockInterval = BlockHeightInterval;
 
diff --git a/primitives/src/pow.rs b/primitives/src/pow.rs
@@ -37,7 +37,7 @@ impl CompactTarget {
     /// Gets the hex representation of this [`CompactTarget`].
     #[cfg(feature = "alloc")]
     #[inline]
-    #[deprecated(since = "TBD", note = "use `format!(\"{var:x}\")` instead")]
+    #[deprecated(since = "1.0.0-rc.0", note = "use `format!(\"{var:x}\")` instead")]
     pub fn to_hex(self) -> alloc::string::String { alloc::format!("{:x}", self) }
 }
 
diff --git a/primitives/src/script/borrowed.rs b/primitives/src/script/borrowed.rs
@@ -116,7 +116,7 @@ impl<T> Script<T> {
 
     /// Returns a copy of the script data.
     #[inline]
-    #[deprecated(since = "TBD", note = "use to_vec instead")]
+    #[deprecated(since = "0.101.0", note = "use to_vec instead")]
     pub fn to_bytes(&self) -> Vec<u8> { self.to_vec() }
 
     /// Returns the length in bytes of the script.
@@ -149,7 +149,7 @@ impl<T> Script<T> {
     #[cfg(feature = "alloc")]
     #[cfg(feature = "hex")]
     #[inline]
-    #[deprecated(since = "TBD", note = "use `format!(\"{var:x}\")` instead")]
+    #[deprecated(since = "1.0.0-rc.0", note = "use `format!(\"{var:x}\")` instead")]
     pub fn to_hex(&self) -> alloc::string::String { alloc::format!("{:x}", self) }
 }
 
diff --git a/primitives/src/script/owned.rs b/primitives/src/script/owned.rs
@@ -129,7 +129,7 @@ impl<T> ScriptBuf<T> {
     #[cfg(feature = "alloc")]
     #[cfg(feature = "hex")]
     #[inline]
-    #[deprecated(since = "TBD", note = "use `format!(\"{var:x}\")` instead")]
+    #[deprecated(since = "1.0.0-rc.0", note = "use `format!(\"{var:x}\")` instead")]
     pub fn to_hex(&self) -> alloc::string::String { alloc::format!("{:x}", self) }
 }
 
diff --git a/primitives/tests/api.rs b/primitives/tests/api.rs
@@ -211,7 +211,7 @@ fn api_can_use_units_modules_from_crate_root() {
 
 #[test]
 fn api_can_use_units_types_from_crate_root() {
-    use bitcoin_primitives::{Amount, BlockHeight, BlockInterval, FeeRate, SignedAmount, Weight};
+    use bitcoin_primitives::{Amount, BlockHeight, BlockHeightInterval, FeeRate, SignedAmount, Weight};
 }
 
 #[test]

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ fn main() {`
`77`	`77`	`assert_eq!(decoded, script_code);`
`78`	`78`
`79`	`79`	`// to/from bytes excludes the prefix, these are not encoding/decoding functions so this is sane.`
`80`		`- let bytes = script_code.to_bytes();`
	`80`	`+ let bytes = script_code.to_vec();`
`81`	`81`	`let got = WitnessScriptBuf::from_bytes(bytes);`
`82`	`82`	`assert_eq!(got, script_code);`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ impl CompactTarget {`
`37`	`37`	/// Gets the hex representation of this [`CompactTarget`].
`38`	`38`	`#[cfg(feature = "alloc")]`
`39`	`39`	`#[inline]`
`40`		- #[deprecated(since = "TBD", note = "use `format!(\"{var:x}\")` instead")]
	`40`	+ #[deprecated(since = "1.0.0-rc.0", note = "use `format!(\"{var:x}\")` instead")]
`41`	`41`	`pub fn to_hex(self) -> alloc::string::String { alloc::format!("{:x}", self) }`
`42`	`42`	`}`
`43`	`43`