From b4a5775dbbd6f5e991a6f8dc8e2a24ae39f50f77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zoe=20Faltib=C3=A0?= Date: Mon, 25 Nov 2024 13:09:43 +0100 Subject: [PATCH 1/3] fix nightly build --- derive/src/xkey.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/derive/src/xkey.rs b/derive/src/xkey.rs index 6b933e2..cf2186c 100644 --- a/derive/src/xkey.rs +++ b/derive/src/xkey.rs @@ -642,7 +642,7 @@ impl XkeyOrigin { self.derivation.iter().copied().map(DerivationIndex::from).collect() } - pub fn child_derivation<'a>(&'a self, child: &'a KeyOrigin) -> Option<&[DerivationIndex]> { + pub fn child_derivation<'a>(&'a self, child: &'a KeyOrigin) -> Option<&'a [DerivationIndex]> { if self.master_fp() == child.master_fp() { let d = child.derivation(); let shared = d.shared_prefix(self.derivation()); From 02ffba72cbb21a1d6a0ca7aaf8765ea61f83fc4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zoe=20Faltib=C3=A0?= Date: Mon, 2 Dec 2024 15:33:02 +0100 Subject: [PATCH 2/3] fix manifest for wasm-testing --- descriptors/Cargo.toml | 2 +- psbt/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/descriptors/Cargo.toml b/descriptors/Cargo.toml index 00a47a5..3989562 100644 --- a/descriptors/Cargo.toml +++ b/descriptors/Cargo.toml @@ -6,7 +6,7 @@ keywords = { workspace = true } categories = { workspace = true } readme = "../README.md" authors = { workspace = true } -homepage = { workspace = true } +homepage.workspace = true repository = { workspace = true } rust-version = { workspace = true } edition = { workspace = true } diff --git a/psbt/Cargo.toml b/psbt/Cargo.toml index b3c6ee1..e0f3739 100644 --- a/psbt/Cargo.toml +++ b/psbt/Cargo.toml @@ -6,7 +6,7 @@ keywords = { workspace = true } categories = { workspace = true } readme = "../README.md" authors = { workspace = true } -homepage = { workspace = true } +homepage.workspace = true repository = { workspace = true } rust-version = { workspace = true } edition = { workspace = true } From 78e84166da3f1fd2e7cd5239a88f76eca5f8005d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zoe=20Faltib=C3=A0?= Date: Mon, 2 Dec 2024 15:38:09 +0100 Subject: [PATCH 3/3] fix lint with 1.85.0-nightly --- psbt/src/coders.rs | 4 ++-- psbt/src/data.rs | 2 +- src/signers.rs | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/psbt/src/coders.rs b/psbt/src/coders.rs index d0e46ba..43cfb95 100644 --- a/psbt/src/coders.rs +++ b/psbt/src/coders.rs @@ -185,7 +185,7 @@ pub trait Encode { fn encode(&self, writer: &mut dyn Write) -> Result; } -impl<'a, T: Encode> Encode for &'a T { +impl Encode for &'_ T { fn encode(&self, writer: &mut dyn Write) -> Result { (*self).encode(writer) } } @@ -677,7 +677,7 @@ macro_rules! psbt_code_using_consensus { } struct WriteWrap<'a>(&'a mut dyn Write); -impl<'a> Write for WriteWrap<'a> { +impl Write for WriteWrap<'_> { fn write(&mut self, buf: &[u8]) -> io::Result { self.0.write(buf) } fn flush(&mut self) -> io::Result<()> { self.0.flush() } } diff --git a/psbt/src/data.rs b/psbt/src/data.rs index 28e4a22..cc1e283 100644 --- a/psbt/src/data.rs +++ b/psbt/src/data.rs @@ -1041,7 +1041,7 @@ impl Output { if terminal.len() != 1 { return None; } - return terminal.first().copied(); + terminal.first().copied() } } diff --git a/src/signers.rs b/src/signers.rs index c8b898e..15bd42c 100644 --- a/src/signers.rs +++ b/src/signers.rs @@ -80,7 +80,7 @@ impl<'a> TestnetRefSigner<'a> { } } -impl<'a> Signer for TestnetRefSigner<'a> { +impl Signer for TestnetRefSigner<'_> { type Sign<'s> = Self where Self: 's; @@ -88,7 +88,7 @@ impl<'a> Signer for TestnetRefSigner<'a> { fn approve(&self, _: &Psbt) -> Result, Rejected> { Ok(self.clone()) } } -impl<'a> TestnetRefSigner<'a> { +impl TestnetRefSigner<'_> { fn get(&self, origin: Option<&KeyOrigin>) -> Option { let origin = origin?; self.keys.iter().find_map(|(xo, xpriv)| { @@ -100,7 +100,7 @@ impl<'a> TestnetRefSigner<'a> { } } -impl<'a> Sign for TestnetRefSigner<'a> { +impl Sign for TestnetRefSigner<'_> { fn sign_ecdsa( &self, message: Sighash,