Skip to content

Commit 86305f0

Browse files
committed
ci: clippy: remove a ton of now-elidable lifetimes
1 parent dd3396e commit 86305f0

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

src/descriptor/checksum.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ impl<'f, 'a> Formatter<'f, 'a> {
177177
}
178178
}
179179

180-
impl<'f, 'a> fmt::Write for Formatter<'f, 'a> {
180+
impl fmt::Write for Formatter<'_, '_> {
181181
fn write_str(&mut self, s: &str) -> fmt::Result {
182182
self.fmt.write_str(s)?;
183183
self.eng.input(s).map_err(|_| fmt::Error)

src/descriptor/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ impl Descriptor<DescriptorPublicKey> {
730730

731731
struct KeyMapWrapper<'a, C: secp256k1::Signing>(KeyMap, &'a secp256k1::Secp256k1<C>);
732732

733-
impl<'a, C: secp256k1::Signing> Translator<String> for KeyMapWrapper<'a, C> {
733+
impl<C: secp256k1::Signing> Translator<String> for KeyMapWrapper<'_, C> {
734734
type TargetPk = DescriptorPublicKey;
735735
type Error = Error;
736736

@@ -778,7 +778,7 @@ impl Descriptor<DescriptorPublicKey> {
778778
pub fn to_string_with_secret(&self, key_map: &KeyMap) -> String {
779779
struct KeyMapLookUp<'a>(&'a KeyMap);
780780

781-
impl<'a> Translator<DescriptorPublicKey> for KeyMapLookUp<'a> {
781+
impl Translator<DescriptorPublicKey> for KeyMapLookUp<'_> {
782782
type TargetPk = String;
783783
type Error = core::convert::Infallible;
784784

@@ -941,7 +941,7 @@ impl Descriptor<DefiniteDescriptorKey> {
941941
) -> Result<Descriptor<bitcoin::PublicKey>, ConversionError> {
942942
struct Derivator<'a, C: secp256k1::Verification>(&'a secp256k1::Secp256k1<C>);
943943

944-
impl<'a, C: secp256k1::Verification> Translator<DefiniteDescriptorKey> for Derivator<'a, C> {
944+
impl<C: secp256k1::Verification> Translator<DefiniteDescriptorKey> for Derivator<'_, C> {
945945
type TargetPk = bitcoin::PublicKey;
946946
type Error = ConversionError;
947947

src/descriptor/tr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ pub struct TapTreeIter<'a, Pk: MiniscriptKey> {
465465
stack: Vec<(u8, &'a TapTree<Pk>)>,
466466
}
467467

468-
impl<'a, Pk: MiniscriptKey> TapTreeIter<'a, Pk> {
468+
impl<Pk: MiniscriptKey> TapTreeIter<'_, Pk> {
469469
/// Helper function to return an empty iterator from Descriptor::tap_tree_iter.
470470
pub(super) fn empty() -> Self { Self { stack: vec![] } }
471471
}

src/miniscript/iter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ impl<'a, Pk: MiniscriptKey, Ctx: ScriptContext> PkIter<'a, Pk, Ctx> {
176176
}
177177
}
178178

179-
impl<'a, Pk: MiniscriptKey, Ctx: ScriptContext> Iterator for PkIter<'a, Pk, Ctx> {
179+
impl<Pk: MiniscriptKey, Ctx: ScriptContext> Iterator for PkIter<'_, Pk, Ctx> {
180180
type Item = Pk;
181181

182182
fn next(&mut self) -> Option<Self::Item> {

src/miniscript/lex.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ pub enum Token<'s> {
5050
Bytes65(&'s [u8]),
5151
}
5252

53-
impl<'s> fmt::Display for Token<'s> {
53+
impl fmt::Display for Token<'_> {
5454
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
5555
match *self {
5656
Token::Num(n) => write!(f, "#{}", n),

src/miniscript/satisfy.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ impl_satisfier_for_map_hash_tapleafhash_to_key_taproot_sig! {
262262
impl Satisfier<Pk> for HashMap<(hash160::Hash, TapLeafHash), (Pk, bitcoin::taproot::Signature)>
263263
}
264264

265-
impl<'a, Pk: MiniscriptKey + ToPublicKey, S: Satisfier<Pk>> Satisfier<Pk> for &'a S {
265+
impl<Pk: MiniscriptKey + ToPublicKey, S: Satisfier<Pk>> Satisfier<Pk> for &S {
266266
fn lookup_ecdsa_sig(&self, p: &Pk) -> Option<bitcoin::ecdsa::Signature> {
267267
(**self).lookup_ecdsa_sig(p)
268268
}
@@ -322,7 +322,7 @@ impl<'a, Pk: MiniscriptKey + ToPublicKey, S: Satisfier<Pk>> Satisfier<Pk> for &'
322322
fn check_after(&self, n: absolute::LockTime) -> bool { (**self).check_after(n) }
323323
}
324324

325-
impl<'a, Pk: MiniscriptKey + ToPublicKey, S: Satisfier<Pk>> Satisfier<Pk> for &'a mut S {
325+
impl<Pk: MiniscriptKey + ToPublicKey, S: Satisfier<Pk>> Satisfier<Pk> for &mut S {
326326
fn lookup_ecdsa_sig(&self, p: &Pk) -> Option<bitcoin::ecdsa::Signature> {
327327
(**self).lookup_ecdsa_sig(p)
328328
}

src/plan.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ macro_rules! impl_log_method {
129129
}
130130

131131
#[cfg(feature = "std")]
132-
impl<'a> AssetProvider<DefiniteDescriptorKey> for LoggerAssetProvider<'a> {
132+
impl AssetProvider<DefiniteDescriptorKey> for LoggerAssetProvider<'_> {
133133
impl_log_method!(provider_lookup_ecdsa_sig, pk: &DefiniteDescriptorKey, -> bool);
134134
impl_log_method!(provider_lookup_tap_key_spend_sig, pk: &DefiniteDescriptorKey, -> Option<usize>);
135135
impl_log_method!(provider_lookup_tap_leaf_script_sig, pk: &DefiniteDescriptorKey, leaf_hash: &TapLeafHash, -> Option<usize>);

src/primitives/threshold.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ struct ThreshDisplay<'t, 's, T, const MAX: usize> {
263263
show_k: bool,
264264
}
265265

266-
impl<'t, 's, T, const MAX: usize> fmt::Display for ThreshDisplay<'t, 's, T, MAX>
266+
impl<T, const MAX: usize> fmt::Display for ThreshDisplay<'_, '_, T, MAX>
267267
where
268268
T: fmt::Display,
269269
{
@@ -286,7 +286,7 @@ where
286286
}
287287
}
288288

289-
impl<'t, 's, T, const MAX: usize> fmt::Debug for ThreshDisplay<'t, 's, T, MAX>
289+
impl<T, const MAX: usize> fmt::Debug for ThreshDisplay<'_, '_, T, MAX>
290290
where
291291
T: fmt::Debug,
292292
{

src/psbt/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ impl<'psbt> PsbtInputSatisfier<'psbt> {
254254
pub fn new(psbt: &'psbt Psbt, index: usize) -> Self { Self { psbt, index } }
255255
}
256256

257-
impl<'psbt, Pk: MiniscriptKey + ToPublicKey> Satisfier<Pk> for PsbtInputSatisfier<'psbt> {
257+
impl<Pk: MiniscriptKey + ToPublicKey> Satisfier<Pk> for PsbtInputSatisfier<'_> {
258258
fn lookup_tap_key_spend_sig(&self) -> Option<bitcoin::taproot::Signature> {
259259
self.psbt.inputs[self.index].tap_key_sig
260260
}

0 commit comments

Comments
 (0)