milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Merge rust-bitcoin/rust-bitcoin#4438: Automated nightly rustfmt (2025-05-04) 

1f19d9b4bd 2025-05-04 automated rustfmt nightly (Fmt Bot)

Pull request description:

  Automated nightly `rustfmt` changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action

ACKs for top commit:
  apoelstra:
    ACK 1f19d9b4bd8c55b9a7dc233c4b969d5d54d3a951; successfully ran local tests
  tcharding:
    ACK 1f19d9b4bd

Tree-SHA512: c13d24482848cc6e103304b52bd51964fbca9f3b09b5c179af7956aef0537b6cc05014a203844c93d0b21da08cd51bf4a84dc5611b61ae5684ae57b0beb2848f
This commit is contained in:
merge-script 2025-05-05 12:53:41 +00:00
parent 1b04f5df65 1f19d9b4bd
commit ec44656933
No known key found for this signature in database
GPG Key ID: C588D63CE41B97C1
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bitcoin/src/crypto/key.rs
View File

@ -888,7 +888,7 @@ impl TweakedPublicKey {
} }
#[doc(hidden)] #[doc(hidden)]
#[deprecated(since="0.33.0", note="use to_x_only_public_key() instead")] #[deprecated(since = "0.33.0", note = "use to_x_only_public_key() instead")]
pub fn to_inner(self) -> XOnlyPublicKey { self.0 } pub fn to_inner(self) -> XOnlyPublicKey { self.0 }
/// Returns the underlying x-only public key. /// Returns the underlying x-only public key.
@ -916,7 +916,7 @@ impl TweakedKeypair {
pub fn dangerous_assume_tweaked(pair: Keypair) -> TweakedKeypair { TweakedKeypair(pair) } pub fn dangerous_assume_tweaked(pair: Keypair) -> TweakedKeypair { TweakedKeypair(pair) }
#[doc(hidden)] #[doc(hidden)]
#[deprecated(since="0.33.0", note="use to_keypair() instead")] #[deprecated(since = "0.33.0", note = "use to_keypair() instead")]
pub fn to_inner(self) -> Keypair { self.0 } pub fn to_inner(self) -> Keypair { self.0 }
/// Returns the underlying key pair. /// Returns the underlying key pair.

6
bitcoin/src/taproot/mod.rs
View File

@ -1784,7 +1784,11 @@ mod test {
let script = ScriptBuf::from_hex_no_length_prefix(script_hex).unwrap(); let script = ScriptBuf::from_hex_no_length_prefix(script_hex).unwrap();
let control_block = ControlBlock::from_hex(control_block_hex).unwrap(); let control_block = ControlBlock::from_hex(control_block_hex).unwrap();
assert_eq!(control_block_hex, control_block.serialize().to_lower_hex_string()); assert_eq!(control_block_hex, control_block.serialize().to_lower_hex_string());
assert!(control_block.verify_taproot_commitment(secp, out_pk.to_x_only_public_key(), &script)); assert!(control_block.verify_taproot_commitment(
secp,
out_pk.to_x_only_public_key(),
&script
));
} }
#[test] #[test]

2
units/src/amount/tests.rs
View File

@ -13,9 +13,9 @@ use std::panic;
use ::serde::{Deserialize, Serialize}; use ::serde::{Deserialize, Serialize};
use super::*; use super::*;
use crate::{MathOp, NumOpResult};
#[cfg(feature = "alloc")] #[cfg(feature = "alloc")]
use crate::{FeeRate, Weight}; use crate::{FeeRate, Weight};
use crate::{MathOp, NumOpResult};
#[track_caller] #[track_caller]
fn sat(sat: u64) -> Amount { Amount::from_sat(sat).unwrap() } fn sat(sat: u64) -> Amount { Amount::from_sat(sat).unwrap() }

2
units/tests/str.rs
View File

@ -2,8 +2,8 @@
//! Do basic regression tests on the `Display` and `FromStr` impls. //! Do basic regression tests on the `Display` and `FromStr` impls.
use bitcoin_units::locktime::{absolute, relative};
use bitcoin_units::amount::Denomination; use bitcoin_units::amount::Denomination;
use bitcoin_units::locktime::{absolute, relative};
use bitcoin_units::{Amount, BlockHeight, BlockInterval, FeeRate, SignedAmount, Weight}; use bitcoin_units::{Amount, BlockHeight, BlockInterval, FeeRate, SignedAmount, Weight};
macro_rules! check { macro_rules! check {