From 20d3f16a540e629ee3829c8a3d90269156918a13 Mon Sep 17 00:00:00 2001 From: "Jamil Lambert, PhD" Date: Mon, 20 Jan 2025 16:43:48 +0000 Subject: [PATCH 1/2] Fix clippy lint in new rustc nightly New nightly lint warning "called `Iterator::last` on a `DoubleEndedIterator`; this will needlessly iterate the entire iterator" Code that gives the warning is correct, allow the lint to remove the warning. Update rustc nightly to 2025-01-16 --- bitcoin/src/taproot/merkle_branch.rs | 1 + nightly-version | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bitcoin/src/taproot/merkle_branch.rs b/bitcoin/src/taproot/merkle_branch.rs index c629eacb6..10b2d0718 100644 --- a/bitcoin/src/taproot/merkle_branch.rs +++ b/bitcoin/src/taproot/merkle_branch.rs @@ -252,6 +252,7 @@ impl Iterator for IntoIter { fn nth(&mut self, n: usize) -> Option { self.0.nth(n) } #[inline] + #[allow(clippy::double_ended_iterator_last)] // False positive. Using `.last()` on a `vec::IntoIter` is correct. fn last(self) -> Option { self.0.last() } #[inline] diff --git a/nightly-version b/nightly-version index ecd2b22dc..4b004c97e 100644 --- a/nightly-version +++ b/nightly-version @@ -1 +1 @@ -nightly-2025-01-10 +nightly-2025-01-16 From 6d0c6c61ef759ac4bfc3b16d32e93f1b483b9365 Mon Sep 17 00:00:00 2001 From: "Jamil Lambert, PhD" Date: Mon, 20 Jan 2025 16:44:43 +0000 Subject: [PATCH 2/2] Run just check-api --- api/hashes/all-features.txt | 2 +- api/hashes/alloc-only.txt | 2 +- api/hashes/no-features.txt | 2 +- api/io/alloc-only.txt | 2 +- api/primitives/all-features.txt | 4 +-- api/primitives/alloc-only.txt | 4 +-- api/units/all-features.txt | 64 ++++++++++++++++----------------- api/units/alloc-only.txt | 4 +-- api/units/no-features.txt | 4 +-- 9 files changed, 44 insertions(+), 44 deletions(-) diff --git a/api/hashes/all-features.txt b/api/hashes/all-features.txt index 1f85ee272..6a776f228 100644 --- a/api/hashes/all-features.txt +++ b/api/hashes/all-features.txt @@ -1048,7 +1048,7 @@ pub struct bitcoin_hashes::siphash24::State pub trait bitcoin_hashes::GeneralHash: bitcoin_hashes::Hash pub trait bitcoin_hashes::Hash: core::marker::Copy + core::clone::Clone + core::cmp::PartialEq + core::cmp::Eq + core::cmp::PartialOrd + core::cmp::Ord + core::hash::Hash + core::convert::AsRef<[u8]> pub trait bitcoin_hashes::HashEngine: core::clone::Clone -pub trait bitcoin_hashes::IsByteArray: core::convert::AsRef<[u8]> + sealed::IsByteArray +pub trait bitcoin_hashes::IsByteArray: core::convert::AsRef<[u8]> + bitcoin_hashes::sealed::IsByteArray pub trait bitcoin_hashes::sha256t::Tag pub type bitcoin_hashes::GeneralHash::Engine: bitcoin_hashes::HashEngine pub type bitcoin_hashes::Hash::Bytes: core::marker::Copy + bitcoin_hashes::IsByteArray diff --git a/api/hashes/alloc-only.txt b/api/hashes/alloc-only.txt index 93d5bf78e..35bf80f4d 100644 --- a/api/hashes/alloc-only.txt +++ b/api/hashes/alloc-only.txt @@ -900,7 +900,7 @@ pub struct bitcoin_hashes::siphash24::State pub trait bitcoin_hashes::GeneralHash: bitcoin_hashes::Hash pub trait bitcoin_hashes::Hash: core::marker::Copy + core::clone::Clone + core::cmp::PartialEq + core::cmp::Eq + core::cmp::PartialOrd + core::cmp::Ord + core::hash::Hash + core::convert::AsRef<[u8]> pub trait bitcoin_hashes::HashEngine: core::clone::Clone -pub trait bitcoin_hashes::IsByteArray: core::convert::AsRef<[u8]> + sealed::IsByteArray +pub trait bitcoin_hashes::IsByteArray: core::convert::AsRef<[u8]> + bitcoin_hashes::sealed::IsByteArray pub trait bitcoin_hashes::sha256t::Tag pub type bitcoin_hashes::GeneralHash::Engine: bitcoin_hashes::HashEngine pub type bitcoin_hashes::Hash::Bytes: core::marker::Copy + bitcoin_hashes::IsByteArray diff --git a/api/hashes/no-features.txt b/api/hashes/no-features.txt index e1ce22551..cd19b4663 100644 --- a/api/hashes/no-features.txt +++ b/api/hashes/no-features.txt @@ -847,7 +847,7 @@ pub struct bitcoin_hashes::siphash24::State pub trait bitcoin_hashes::GeneralHash: bitcoin_hashes::Hash pub trait bitcoin_hashes::Hash: core::marker::Copy + core::clone::Clone + core::cmp::PartialEq + core::cmp::Eq + core::cmp::PartialOrd + core::cmp::Ord + core::hash::Hash + core::convert::AsRef<[u8]> pub trait bitcoin_hashes::HashEngine: core::clone::Clone -pub trait bitcoin_hashes::IsByteArray: core::convert::AsRef<[u8]> + sealed::IsByteArray +pub trait bitcoin_hashes::IsByteArray: core::convert::AsRef<[u8]> + bitcoin_hashes::sealed::IsByteArray pub trait bitcoin_hashes::sha256t::Tag pub type bitcoin_hashes::GeneralHash::Engine: bitcoin_hashes::HashEngine pub type bitcoin_hashes::Hash::Bytes: core::marker::Copy + bitcoin_hashes::IsByteArray diff --git a/api/io/alloc-only.txt b/api/io/alloc-only.txt index 5cb612794..93035f544 100644 --- a/api/io/alloc-only.txt +++ b/api/io/alloc-only.txt @@ -119,7 +119,7 @@ pub fn bitcoin_io::Error::fmt(&self, fmt: &mut core::fmt::Formatter<'_>) -> core pub fn bitcoin_io::Error::from(kind: bitcoin_io::ErrorKind) -> bitcoin_io::Error pub fn bitcoin_io::Error::get_ref(&self) -> core::option::Option<&(dyn core::fmt::Debug + core::marker::Send + core::marker::Sync + 'static)> pub fn bitcoin_io::Error::kind(&self) -> bitcoin_io::ErrorKind -pub fn bitcoin_io::Error::new(kind: bitcoin_io::ErrorKind, error: E) -> bitcoin_io::Error +pub fn bitcoin_io::Error::new(kind: bitcoin_io::ErrorKind, error: E) -> bitcoin_io::Error pub fn bitcoin_io::ErrorKind::clone(&self) -> bitcoin_io::ErrorKind pub fn bitcoin_io::ErrorKind::eq(&self, other: &bitcoin_io::ErrorKind) -> bool pub fn bitcoin_io::ErrorKind::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result diff --git a/api/primitives/all-features.txt b/api/primitives/all-features.txt index 7412ae3dc..b2cfbe1e0 100644 --- a/api/primitives/all-features.txt +++ b/api/primitives/all-features.txt @@ -1975,8 +1975,8 @@ pub struct bitcoin_primitives::transaction::Version(pub i32) pub struct bitcoin_primitives::transaction::Wtxid(_) pub struct bitcoin_primitives::witness::Iter<'a> pub struct bitcoin_primitives::witness::Witness -pub trait bitcoin_primitives::BlockValidation: sealed::Validation + core::marker::Sync + core::marker::Send + core::marker::Sized + core::marker::Unpin -pub trait bitcoin_primitives::block::Validation: sealed::Validation + core::marker::Sync + core::marker::Send + core::marker::Sized + core::marker::Unpin +pub trait bitcoin_primitives::BlockValidation: bitcoin_primitives::block::sealed::Validation + core::marker::Sync + core::marker::Send + core::marker::Sized + core::marker::Unpin +pub trait bitcoin_primitives::block::Validation: bitcoin_primitives::block::sealed::Validation + core::marker::Sync + core::marker::Send + core::marker::Sized + core::marker::Unpin pub type &'a bitcoin_primitives::witness::Witness::IntoIter = bitcoin_primitives::witness::Iter<'a> pub type &'a bitcoin_primitives::witness::Witness::Item = &'a [u8] pub type bitcoin_primitives::block::BlockHash::Bytes = ::Bytes diff --git a/api/primitives/alloc-only.txt b/api/primitives/alloc-only.txt index 3e0f4d2b6..1ccd74b29 100644 --- a/api/primitives/alloc-only.txt +++ b/api/primitives/alloc-only.txt @@ -1832,8 +1832,8 @@ pub struct bitcoin_primitives::transaction::Version(pub i32) pub struct bitcoin_primitives::transaction::Wtxid(_) pub struct bitcoin_primitives::witness::Iter<'a> pub struct bitcoin_primitives::witness::Witness -pub trait bitcoin_primitives::BlockValidation: sealed::Validation + core::marker::Sync + core::marker::Send + core::marker::Sized + core::marker::Unpin -pub trait bitcoin_primitives::block::Validation: sealed::Validation + core::marker::Sync + core::marker::Send + core::marker::Sized + core::marker::Unpin +pub trait bitcoin_primitives::BlockValidation: bitcoin_primitives::block::sealed::Validation + core::marker::Sync + core::marker::Send + core::marker::Sized + core::marker::Unpin +pub trait bitcoin_primitives::block::Validation: bitcoin_primitives::block::sealed::Validation + core::marker::Sync + core::marker::Send + core::marker::Sized + core::marker::Unpin pub type &'a bitcoin_primitives::witness::Witness::IntoIter = bitcoin_primitives::witness::Iter<'a> pub type &'a bitcoin_primitives::witness::Witness::Item = &'a [u8] pub type bitcoin_primitives::block::BlockHash::Bytes = ::Bytes diff --git a/api/units/all-features.txt b/api/units/all-features.txt index 0f5a1c0f2..5dd520911 100644 --- a/api/units/all-features.txt +++ b/api/units/all-features.txt @@ -811,9 +811,9 @@ pub fn bitcoin_units::Amount::arbitrary(u: &mut arbitrary::unstructured::Unstruc pub fn bitcoin_units::Amount::clone(&self) -> bitcoin_units::Amount pub fn bitcoin_units::Amount::cmp(&self, other: &bitcoin_units::Amount) -> core::cmp::Ordering pub fn bitcoin_units::Amount::default() -> Self -pub fn bitcoin_units::Amount::des_btc<'d, D: serde::de::Deserializer<'d>>(d: D, _: private::Token) -> core::result::Result::Error> -pub fn bitcoin_units::Amount::des_sat<'d, D: serde::de::Deserializer<'d>>(d: D, _: private::Token) -> core::result::Result::Error> -pub fn bitcoin_units::Amount::des_str<'d, D: serde::de::Deserializer<'d>>(d: D, _: private::Token) -> core::result::Result::Error> +pub fn bitcoin_units::Amount::des_btc<'d, D: serde::de::Deserializer<'d>>(d: D, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result::Error> +pub fn bitcoin_units::Amount::des_sat<'d, D: serde::de::Deserializer<'d>>(d: D, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result::Error> +pub fn bitcoin_units::Amount::des_str<'d, D: serde::de::Deserializer<'d>>(d: D, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result::Error> pub fn bitcoin_units::Amount::display_dynamic(self) -> bitcoin_units::amount::Display pub fn bitcoin_units::Amount::display_in(self, denomination: bitcoin_units::amount::Denomination) -> bitcoin_units::amount::Display pub fn bitcoin_units::Amount::div(self, rhs: bitcoin_units::weight::Weight) -> Self::Output @@ -833,12 +833,12 @@ pub fn bitcoin_units::Amount::mul_assign(&mut self, rhs: u64) pub fn bitcoin_units::Amount::partial_cmp(&self, other: &bitcoin_units::Amount) -> core::option::Option pub fn bitcoin_units::Amount::rem(self, modulus: u64) -> Self pub fn bitcoin_units::Amount::rem_assign(&mut self, modulus: u64) -pub fn bitcoin_units::Amount::ser_btc(self, s: S, _: private::Token) -> core::result::Result<::Ok, ::Error> -pub fn bitcoin_units::Amount::ser_btc_opt(self, s: S, _: private::Token) -> core::result::Result<::Ok, ::Error> -pub fn bitcoin_units::Amount::ser_sat(self, s: S, _: private::Token) -> core::result::Result<::Ok, ::Error> -pub fn bitcoin_units::Amount::ser_sat_opt(self, s: S, _: private::Token) -> core::result::Result<::Ok, ::Error> -pub fn bitcoin_units::Amount::ser_str(self, s: S, _: private::Token) -> core::result::Result<::Ok, ::Error> -pub fn bitcoin_units::Amount::ser_str_opt(self, s: S, _: private::Token) -> core::result::Result<::Ok, ::Error> +pub fn bitcoin_units::Amount::ser_btc(self, s: S, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result<::Ok, ::Error> +pub fn bitcoin_units::Amount::ser_btc_opt(self, s: S, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result<::Ok, ::Error> +pub fn bitcoin_units::Amount::ser_sat(self, s: S, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result<::Ok, ::Error> +pub fn bitcoin_units::Amount::ser_sat_opt(self, s: S, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result<::Ok, ::Error> +pub fn bitcoin_units::Amount::ser_str(self, s: S, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result<::Ok, ::Error> +pub fn bitcoin_units::Amount::ser_str_opt(self, s: S, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result<::Ok, ::Error> pub fn bitcoin_units::Amount::sub(self, rhs: &bitcoin_units::Amount) -> Self::Output pub fn bitcoin_units::Amount::sub(self, rhs: bitcoin_units::Amount) -> Self::Output pub fn bitcoin_units::Amount::sub_assign(&mut self, rhs: &bitcoin_units::Amount) @@ -851,7 +851,7 @@ pub fn bitcoin_units::Amount::to_signed(self) -> bitcoin_units::SignedAmount pub fn bitcoin_units::Amount::to_string_in(self, denom: bitcoin_units::amount::Denomination) -> alloc::string::String pub fn bitcoin_units::Amount::to_string_with_denomination(self, denom: bitcoin_units::amount::Denomination) -> alloc::string::String pub fn bitcoin_units::Amount::try_from(value: bitcoin_units::SignedAmount) -> core::result::Result -pub fn bitcoin_units::Amount::type_prefix(_: private::Token) -> &'static str +pub fn bitcoin_units::Amount::type_prefix(_: bitcoin_units::amount::serde::private::Token) -> &'static str pub fn bitcoin_units::Amount::unchecked_add(self, rhs: bitcoin_units::Amount) -> bitcoin_units::Amount pub fn bitcoin_units::Amount::unchecked_sub(self, rhs: bitcoin_units::Amount) -> bitcoin_units::Amount pub fn bitcoin_units::SignedAmount::abs(self) -> bitcoin_units::SignedAmount @@ -863,9 +863,9 @@ pub fn bitcoin_units::SignedAmount::arbitrary(u: &mut arbitrary::unstructured::U pub fn bitcoin_units::SignedAmount::clone(&self) -> bitcoin_units::SignedAmount pub fn bitcoin_units::SignedAmount::cmp(&self, other: &bitcoin_units::SignedAmount) -> core::cmp::Ordering pub fn bitcoin_units::SignedAmount::default() -> Self -pub fn bitcoin_units::SignedAmount::des_btc<'d, D: serde::de::Deserializer<'d>>(d: D, _: private::Token) -> core::result::Result::Error> -pub fn bitcoin_units::SignedAmount::des_sat<'d, D: serde::de::Deserializer<'d>>(d: D, _: private::Token) -> core::result::Result::Error> -pub fn bitcoin_units::SignedAmount::des_str<'d, D: serde::de::Deserializer<'d>>(d: D, _: private::Token) -> core::result::Result::Error> +pub fn bitcoin_units::SignedAmount::des_btc<'d, D: serde::de::Deserializer<'d>>(d: D, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result::Error> +pub fn bitcoin_units::SignedAmount::des_sat<'d, D: serde::de::Deserializer<'d>>(d: D, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result::Error> +pub fn bitcoin_units::SignedAmount::des_str<'d, D: serde::de::Deserializer<'d>>(d: D, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result::Error> pub fn bitcoin_units::SignedAmount::display_dynamic(self) -> bitcoin_units::amount::Display pub fn bitcoin_units::SignedAmount::display_in(self, denomination: bitcoin_units::amount::Denomination) -> bitcoin_units::amount::Display pub fn bitcoin_units::SignedAmount::div(self, rhs: i64) -> Self::Output @@ -889,12 +889,12 @@ pub fn bitcoin_units::SignedAmount::partial_cmp(&self, other: &bitcoin_units::Si pub fn bitcoin_units::SignedAmount::positive_sub(self, rhs: bitcoin_units::SignedAmount) -> core::option::Option pub fn bitcoin_units::SignedAmount::rem(self, modulus: i64) -> Self pub fn bitcoin_units::SignedAmount::rem_assign(&mut self, modulus: i64) -pub fn bitcoin_units::SignedAmount::ser_btc(self, s: S, _: private::Token) -> core::result::Result<::Ok, ::Error> -pub fn bitcoin_units::SignedAmount::ser_btc_opt(self, s: S, _: private::Token) -> core::result::Result<::Ok, ::Error> -pub fn bitcoin_units::SignedAmount::ser_sat(self, s: S, _: private::Token) -> core::result::Result<::Ok, ::Error> -pub fn bitcoin_units::SignedAmount::ser_sat_opt(self, s: S, _: private::Token) -> core::result::Result<::Ok, ::Error> -pub fn bitcoin_units::SignedAmount::ser_str(self, s: S, _: private::Token) -> core::result::Result<::Ok, ::Error> -pub fn bitcoin_units::SignedAmount::ser_str_opt(self, s: S, _: private::Token) -> core::result::Result<::Ok, ::Error> +pub fn bitcoin_units::SignedAmount::ser_btc(self, s: S, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result<::Ok, ::Error> +pub fn bitcoin_units::SignedAmount::ser_btc_opt(self, s: S, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result<::Ok, ::Error> +pub fn bitcoin_units::SignedAmount::ser_sat(self, s: S, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result<::Ok, ::Error> +pub fn bitcoin_units::SignedAmount::ser_sat_opt(self, s: S, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result<::Ok, ::Error> +pub fn bitcoin_units::SignedAmount::ser_str(self, s: S, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result<::Ok, ::Error> +pub fn bitcoin_units::SignedAmount::ser_str_opt(self, s: S, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result<::Ok, ::Error> pub fn bitcoin_units::SignedAmount::signum(self) -> i64 pub fn bitcoin_units::SignedAmount::sub(self, rhs: &bitcoin_units::SignedAmount) -> Self::Output pub fn bitcoin_units::SignedAmount::sub(self, rhs: bitcoin_units::SignedAmount) -> Self::Output @@ -907,7 +907,7 @@ pub fn bitcoin_units::SignedAmount::to_float_in(self, denom: bitcoin_units::amou pub fn bitcoin_units::SignedAmount::to_string_in(self, denom: bitcoin_units::amount::Denomination) -> alloc::string::String pub fn bitcoin_units::SignedAmount::to_string_with_denomination(self, denom: bitcoin_units::amount::Denomination) -> alloc::string::String pub fn bitcoin_units::SignedAmount::to_unsigned(self) -> core::result::Result -pub fn bitcoin_units::SignedAmount::type_prefix(_: private::Token) -> &'static str +pub fn bitcoin_units::SignedAmount::type_prefix(_: bitcoin_units::amount::serde::private::Token) -> &'static str pub fn bitcoin_units::SignedAmount::unchecked_add(self, rhs: bitcoin_units::SignedAmount) -> bitcoin_units::SignedAmount pub fn bitcoin_units::SignedAmount::unchecked_sub(self, rhs: bitcoin_units::SignedAmount) -> bitcoin_units::SignedAmount pub fn bitcoin_units::SignedAmount::unsigned_abs(self) -> bitcoin_units::Amount @@ -977,16 +977,16 @@ pub fn bitcoin_units::amount::UnknownDenominationError::clone(&self) -> bitcoin_ pub fn bitcoin_units::amount::UnknownDenominationError::eq(&self, other: &bitcoin_units::amount::UnknownDenominationError) -> bool pub fn bitcoin_units::amount::UnknownDenominationError::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result pub fn bitcoin_units::amount::UnknownDenominationError::source(&self) -> core::option::Option<&(dyn core::error::Error + 'static)> -pub fn bitcoin_units::amount::serde::SerdeAmount::des_btc<'d, D: serde::de::Deserializer<'d>>(d: D, _: private::Token) -> core::result::Result::Error> -pub fn bitcoin_units::amount::serde::SerdeAmount::des_sat<'d, D: serde::de::Deserializer<'d>>(d: D, _: private::Token) -> core::result::Result::Error> -pub fn bitcoin_units::amount::serde::SerdeAmount::des_str<'d, D: serde::de::Deserializer<'d>>(d: D, _: private::Token) -> core::result::Result::Error> -pub fn bitcoin_units::amount::serde::SerdeAmount::ser_btc(self, s: S, _: private::Token) -> core::result::Result<::Ok, ::Error> -pub fn bitcoin_units::amount::serde::SerdeAmount::ser_sat(self, s: S, _: private::Token) -> core::result::Result<::Ok, ::Error> -pub fn bitcoin_units::amount::serde::SerdeAmount::ser_str(self, s: S, _: private::Token) -> core::result::Result<::Ok, ::Error> -pub fn bitcoin_units::amount::serde::SerdeAmountForOpt::ser_btc_opt(self, s: S, _: private::Token) -> core::result::Result<::Ok, ::Error> -pub fn bitcoin_units::amount::serde::SerdeAmountForOpt::ser_sat_opt(self, s: S, _: private::Token) -> core::result::Result<::Ok, ::Error> -pub fn bitcoin_units::amount::serde::SerdeAmountForOpt::ser_str_opt(self, s: S, _: private::Token) -> core::result::Result<::Ok, ::Error> -pub fn bitcoin_units::amount::serde::SerdeAmountForOpt::type_prefix(_: private::Token) -> &'static str +pub fn bitcoin_units::amount::serde::SerdeAmount::des_btc<'d, D: serde::de::Deserializer<'d>>(d: D, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result::Error> +pub fn bitcoin_units::amount::serde::SerdeAmount::des_sat<'d, D: serde::de::Deserializer<'d>>(d: D, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result::Error> +pub fn bitcoin_units::amount::serde::SerdeAmount::des_str<'d, D: serde::de::Deserializer<'d>>(d: D, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result::Error> +pub fn bitcoin_units::amount::serde::SerdeAmount::ser_btc(self, s: S, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result<::Ok, ::Error> +pub fn bitcoin_units::amount::serde::SerdeAmount::ser_sat(self, s: S, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result<::Ok, ::Error> +pub fn bitcoin_units::amount::serde::SerdeAmount::ser_str(self, s: S, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result<::Ok, ::Error> +pub fn bitcoin_units::amount::serde::SerdeAmountForOpt::ser_btc_opt(self, s: S, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result<::Ok, ::Error> +pub fn bitcoin_units::amount::serde::SerdeAmountForOpt::ser_sat_opt(self, s: S, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result<::Ok, ::Error> +pub fn bitcoin_units::amount::serde::SerdeAmountForOpt::ser_str_opt(self, s: S, _: bitcoin_units::amount::serde::private::Token) -> core::result::Result<::Ok, ::Error> +pub fn bitcoin_units::amount::serde::SerdeAmountForOpt::type_prefix(_: bitcoin_units::amount::serde::private::Token) -> &'static str pub fn bitcoin_units::amount::serde::as_btc::deserialize<'d, A: bitcoin_units::amount::serde::SerdeAmount, D: serde::de::Deserializer<'d>>(d: D) -> core::result::Result::Error> pub fn bitcoin_units::amount::serde::as_btc::opt::deserialize<'d, A: bitcoin_units::amount::serde::SerdeAmountForOpt, D: serde::de::Deserializer<'d>>(d: D) -> core::result::Result, ::Error> pub fn bitcoin_units::amount::serde::as_btc::opt::serialize(a: &core::option::Option, s: S) -> core::result::Result<::Ok, ::Error> @@ -1277,10 +1277,10 @@ pub struct bitcoin_units::locktime::relative::TimeOverflowError pub struct bitcoin_units::parse::PrefixedHexError(_) pub struct bitcoin_units::parse::UnprefixedHexError(_) pub struct bitcoin_units::weight::Weight(_) -pub trait bitcoin_units::amount::CheckedSum: sealed::Sealed +pub trait bitcoin_units::amount::CheckedSum: bitcoin_units::amount::sealed::Sealed pub trait bitcoin_units::amount::serde::SerdeAmount: core::marker::Copy + core::marker::Sized pub trait bitcoin_units::amount::serde::SerdeAmountForOpt: core::marker::Copy + core::marker::Sized + bitcoin_units::amount::serde::SerdeAmount -pub trait bitcoin_units::parse::Integer: core::str::traits::FromStr + core::convert::TryFrom + core::marker::Sized + sealed::Sealed +pub trait bitcoin_units::parse::Integer: core::str::traits::FromStr + core::convert::TryFrom + core::marker::Sized + bitcoin_units::parse::sealed::Sealed pub type &bitcoin_units::Amount::Output = bitcoin_units::Amount pub type &bitcoin_units::SignedAmount::Output = bitcoin_units::SignedAmount pub type &bitcoin_units::fee_rate::FeeRate::Output = bitcoin_units::fee_rate::FeeRate diff --git a/api/units/alloc-only.txt b/api/units/alloc-only.txt index 499372621..5caee2ba6 100644 --- a/api/units/alloc-only.txt +++ b/api/units/alloc-only.txt @@ -1107,8 +1107,8 @@ pub struct bitcoin_units::locktime::relative::TimeOverflowError pub struct bitcoin_units::parse::PrefixedHexError(_) pub struct bitcoin_units::parse::UnprefixedHexError(_) pub struct bitcoin_units::weight::Weight(_) -pub trait bitcoin_units::amount::CheckedSum: sealed::Sealed -pub trait bitcoin_units::parse::Integer: core::str::traits::FromStr + core::convert::TryFrom + core::marker::Sized + sealed::Sealed +pub trait bitcoin_units::amount::CheckedSum: bitcoin_units::amount::sealed::Sealed +pub trait bitcoin_units::parse::Integer: core::str::traits::FromStr + core::convert::TryFrom + core::marker::Sized + bitcoin_units::parse::sealed::Sealed pub type &bitcoin_units::Amount::Output = bitcoin_units::Amount pub type &bitcoin_units::SignedAmount::Output = bitcoin_units::SignedAmount pub type &bitcoin_units::fee_rate::FeeRate::Output = bitcoin_units::fee_rate::FeeRate diff --git a/api/units/no-features.txt b/api/units/no-features.txt index 4532ae555..82a703c74 100644 --- a/api/units/no-features.txt +++ b/api/units/no-features.txt @@ -1059,8 +1059,8 @@ pub struct bitcoin_units::locktime::relative::TimeOverflowError pub struct bitcoin_units::parse::PrefixedHexError(_) pub struct bitcoin_units::parse::UnprefixedHexError(_) pub struct bitcoin_units::weight::Weight(_) -pub trait bitcoin_units::amount::CheckedSum: sealed::Sealed -pub trait bitcoin_units::parse::Integer: core::str::traits::FromStr + core::convert::TryFrom + core::marker::Sized + sealed::Sealed +pub trait bitcoin_units::amount::CheckedSum: bitcoin_units::amount::sealed::Sealed +pub trait bitcoin_units::parse::Integer: core::str::traits::FromStr + core::convert::TryFrom + core::marker::Sized + bitcoin_units::parse::sealed::Sealed pub type &bitcoin_units::Amount::Output = bitcoin_units::Amount pub type &bitcoin_units::SignedAmount::Output = bitcoin_units::SignedAmount pub type &bitcoin_units::fee_rate::FeeRate::Output = bitcoin_units::fee_rate::FeeRate