Skip to content

Commit 97f8610

Browse files
committed
Merge rust-bitcoin#3937: Manual update to rustc (to nightly-2025-01-16)
6d0c6c6 Run just check-api (Jamil Lambert, PhD) 20d3f16 Fix clippy lint in new rustc nightly (Jamil Lambert, PhD) Pull request description: Automated update rust-bitcoin#3922 failed due to a new clippy lint and a change in the `cargo-public-api` format. Update nightly to 2025-01-16, fix the clippy lint and run `just check-api`. ACKs for top commit: tcharding: ACK 6d0c6c6 apoelstra: ACK 6d0c6c6; successfully ran local tests Tree-SHA512: a4fb8c3dd253acc0d587399771d4ce7893fc5e16cd9637c4968fd730e101456ecaad786506dc83a3d8447b1ac35617ec649d0af2ca52f1d7deb79b04c5366b56
2 parents f064a6e + 6d0c6c6 commit 97f8610

File tree

11 files changed

+46
-45
lines changed

11 files changed

+46
-45
lines changed

api/hashes/all-features.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1048,7 +1048,7 @@ pub struct bitcoin_hashes::siphash24::State
10481048
pub trait bitcoin_hashes::GeneralHash: bitcoin_hashes::Hash
10491049
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]>
10501050
pub trait bitcoin_hashes::HashEngine: core::clone::Clone
1051-
pub trait bitcoin_hashes::IsByteArray: core::convert::AsRef<[u8]> + sealed::IsByteArray
1051+
pub trait bitcoin_hashes::IsByteArray: core::convert::AsRef<[u8]> + bitcoin_hashes::sealed::IsByteArray
10521052
pub trait bitcoin_hashes::sha256t::Tag
10531053
pub type bitcoin_hashes::GeneralHash::Engine: bitcoin_hashes::HashEngine
10541054
pub type bitcoin_hashes::Hash::Bytes: core::marker::Copy + bitcoin_hashes::IsByteArray

api/hashes/alloc-only.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ pub struct bitcoin_hashes::siphash24::State
900900
pub trait bitcoin_hashes::GeneralHash: bitcoin_hashes::Hash
901901
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]>
902902
pub trait bitcoin_hashes::HashEngine: core::clone::Clone
903-
pub trait bitcoin_hashes::IsByteArray: core::convert::AsRef<[u8]> + sealed::IsByteArray
903+
pub trait bitcoin_hashes::IsByteArray: core::convert::AsRef<[u8]> + bitcoin_hashes::sealed::IsByteArray
904904
pub trait bitcoin_hashes::sha256t::Tag
905905
pub type bitcoin_hashes::GeneralHash::Engine: bitcoin_hashes::HashEngine
906906
pub type bitcoin_hashes::Hash::Bytes: core::marker::Copy + bitcoin_hashes::IsByteArray

api/hashes/no-features.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ pub struct bitcoin_hashes::siphash24::State
847847
pub trait bitcoin_hashes::GeneralHash: bitcoin_hashes::Hash
848848
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]>
849849
pub trait bitcoin_hashes::HashEngine: core::clone::Clone
850-
pub trait bitcoin_hashes::IsByteArray: core::convert::AsRef<[u8]> + sealed::IsByteArray
850+
pub trait bitcoin_hashes::IsByteArray: core::convert::AsRef<[u8]> + bitcoin_hashes::sealed::IsByteArray
851851
pub trait bitcoin_hashes::sha256t::Tag
852852
pub type bitcoin_hashes::GeneralHash::Engine: bitcoin_hashes::HashEngine
853853
pub type bitcoin_hashes::Hash::Bytes: core::marker::Copy + bitcoin_hashes::IsByteArray

api/io/alloc-only.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ pub fn bitcoin_io::Error::fmt(&self, fmt: &mut core::fmt::Formatter<'_>) -> core
119119
pub fn bitcoin_io::Error::from(kind: bitcoin_io::ErrorKind) -> bitcoin_io::Error
120120
pub fn bitcoin_io::Error::get_ref(&self) -> core::option::Option<&(dyn core::fmt::Debug + core::marker::Send + core::marker::Sync + 'static)>
121121
pub fn bitcoin_io::Error::kind(&self) -> bitcoin_io::ErrorKind
122-
pub fn bitcoin_io::Error::new<E: sealed::IntoBoxDynDebug>(kind: bitcoin_io::ErrorKind, error: E) -> bitcoin_io::Error
122+
pub fn bitcoin_io::Error::new<E: bitcoin_io::error::sealed::IntoBoxDynDebug>(kind: bitcoin_io::ErrorKind, error: E) -> bitcoin_io::Error
123123
pub fn bitcoin_io::ErrorKind::clone(&self) -> bitcoin_io::ErrorKind
124124
pub fn bitcoin_io::ErrorKind::eq(&self, other: &bitcoin_io::ErrorKind) -> bool
125125
pub fn bitcoin_io::ErrorKind::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result

api/primitives/all-features.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1975,8 +1975,8 @@ pub struct bitcoin_primitives::transaction::Version(pub i32)
19751975
pub struct bitcoin_primitives::transaction::Wtxid(_)
19761976
pub struct bitcoin_primitives::witness::Iter<'a>
19771977
pub struct bitcoin_primitives::witness::Witness
1978-
pub trait bitcoin_primitives::BlockValidation: sealed::Validation + core::marker::Sync + core::marker::Send + core::marker::Sized + core::marker::Unpin
1979-
pub trait bitcoin_primitives::block::Validation: sealed::Validation + core::marker::Sync + core::marker::Send + core::marker::Sized + core::marker::Unpin
1978+
pub trait bitcoin_primitives::BlockValidation: bitcoin_primitives::block::sealed::Validation + core::marker::Sync + core::marker::Send + core::marker::Sized + core::marker::Unpin
1979+
pub trait bitcoin_primitives::block::Validation: bitcoin_primitives::block::sealed::Validation + core::marker::Sync + core::marker::Send + core::marker::Sized + core::marker::Unpin
19801980
pub type &'a bitcoin_primitives::witness::Witness::IntoIter = bitcoin_primitives::witness::Iter<'a>
19811981
pub type &'a bitcoin_primitives::witness::Witness::Item = &'a [u8]
19821982
pub type bitcoin_primitives::block::BlockHash::Bytes = <bitcoin_hashes::sha256d::Hash as bitcoin_hashes::Hash>::Bytes

api/primitives/alloc-only.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1832,8 +1832,8 @@ pub struct bitcoin_primitives::transaction::Version(pub i32)
18321832
pub struct bitcoin_primitives::transaction::Wtxid(_)
18331833
pub struct bitcoin_primitives::witness::Iter<'a>
18341834
pub struct bitcoin_primitives::witness::Witness
1835-
pub trait bitcoin_primitives::BlockValidation: sealed::Validation + core::marker::Sync + core::marker::Send + core::marker::Sized + core::marker::Unpin
1836-
pub trait bitcoin_primitives::block::Validation: sealed::Validation + core::marker::Sync + core::marker::Send + core::marker::Sized + core::marker::Unpin
1835+
pub trait bitcoin_primitives::BlockValidation: bitcoin_primitives::block::sealed::Validation + core::marker::Sync + core::marker::Send + core::marker::Sized + core::marker::Unpin
1836+
pub trait bitcoin_primitives::block::Validation: bitcoin_primitives::block::sealed::Validation + core::marker::Sync + core::marker::Send + core::marker::Sized + core::marker::Unpin
18371837
pub type &'a bitcoin_primitives::witness::Witness::IntoIter = bitcoin_primitives::witness::Iter<'a>
18381838
pub type &'a bitcoin_primitives::witness::Witness::Item = &'a [u8]
18391839
pub type bitcoin_primitives::block::BlockHash::Bytes = <bitcoin_hashes::sha256d::Hash as bitcoin_hashes::Hash>::Bytes

0 commit comments

Comments
 (0)