clippy: lifetime syntax stuff

Author: apoelstra

src/descriptor/tr.rs

@@ -129,7 +129,7 @@ impl<Pk: MiniscriptKey> TapTree<Pk> {
 
     /// Iterates over all miniscripts in DFS walk order compatible with the
     /// PSBT requirements (BIP 371).
-    pub fn iter(&self) -> TapTreeIter<Pk> { TapTreeIter { stack: vec![(0, self)] } }
+    pub fn iter(&self) -> TapTreeIter<'_, Pk> { TapTreeIter { stack: vec![(0, self)] } }
 
     // Helper function to translate keys
     fn translate_helper<T, Q, E>(&self, t: &mut T) -> Result<TapTree<Q>, TranslateErr<E>>
@@ -196,7 +196,7 @@ impl<Pk: MiniscriptKey> Tr<Pk> {
 
     /// Iterate over all scripts in merkle tree. If there is no script path, the iterator
     /// yields [`None`]
-    pub fn iter_scripts(&self) -> TapTreeIter<Pk> {
+    pub fn iter_scripts(&self) -> TapTreeIter<'_, Pk> {
         match self.tree {
             Some(ref t) => t.iter(),
             None => TapTreeIter { stack: vec![] },
@@ -565,7 +565,7 @@ impl<Pk: MiniscriptKey> fmt::Display for Tr<Pk> {
 }
 
 // Helper function to parse string into miniscript tree form
-fn parse_tr_tree(s: &str) -> Result<expression::Tree, Error> {
+fn parse_tr_tree(s: &str) -> Result<expression::Tree<'_>, Error> {
     expression::check_valid_chars(s)?;
 
     if s.len() > 3 && &s[..3] == "tr(" && s.as_bytes()[s.len() - 1] == b')' {

src/iter/mod.rs

@@ -17,7 +17,7 @@ pub use tree::{
 use crate::sync::Arc;
 use crate::{Miniscript, MiniscriptKey, ScriptContext, Terminal};
 
-impl<'a, Pk: MiniscriptKey, Ctx: ScriptContext> TreeLike for &'a Miniscript<Pk, Ctx> {
+impl<Pk: MiniscriptKey, Ctx: ScriptContext> TreeLike for &'_ Miniscript<Pk, Ctx> {
     fn as_node(&self) -> Tree<Self> {
         use Terminal::*;
         match self.node {

src/miniscript/iter.rs

@@ -18,12 +18,12 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> Miniscript<Pk, Ctx> {
     /// Creates a new [Iter] iterator that will iterate over all [Miniscript] items within
     /// AST by traversing its branches. For the specific algorithm please see
     /// [Iter::next] function.
-    pub fn iter(&self) -> Iter<Pk, Ctx> { Iter::new(self) }
+    pub fn iter(&self) -> Iter<'_, Pk, Ctx> { Iter::new(self) }
 
     /// Creates a new [PkIter] iterator that will iterate over all plain public keys (and not
     /// key hash values) present in [Miniscript] items within AST by traversing all its branches.
     /// For the specific algorithm please see [PkIter::next] function.
-    pub fn iter_pk(&self) -> PkIter<Pk, Ctx> { PkIter::new(self) }
+    pub fn iter_pk(&self) -> PkIter<'_, Pk, Ctx> { PkIter::new(self) }
 
     /// Enumerates all child nodes of the current AST node (`self`) and returns a `Vec` referencing
     /// them.

src/miniscript/lex.rs

@@ -75,7 +75,7 @@ impl<'s> TokenIter<'s> {
     pub fn new(v: Vec<Token<'s>>) -> TokenIter<'s> { TokenIter(v) }
 
     /// Look at the top at Iterator
-    pub fn peek(&self) -> Option<&'s Token> { self.0.last() }
+    pub fn peek(&self) -> Option<&'s Token<'_>> { self.0.last() }
 
     /// Push a value to the iterator
     /// This will be first value consumed by popun_

src/miniscript/mod.rs

@@ -551,7 +551,7 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> Miniscript<Pk, Ctx> {
 ///
 /// Returns the fragment name (right of the `:`) and a list of wrappers
 /// (left of the `:`).
-fn split_expression_name(name: &str) -> Result<(&str, Cow<str>), Error> {
+fn split_expression_name(name: &str) -> Result<(&str, Cow<'_, str>), Error> {
     let mut aliased_wrap;
     let frag_name;
     let frag_wrap;

src/miniscript/satisfy.rs

@@ -259,7 +259,7 @@ impl_satisfier_for_map_hash_tapleafhash_to_key_taproot_sig! {
     impl Satisfier<Pk> for HashMap<(hash160::Hash, TapLeafHash), (Pk, bitcoin::taproot::Signature)>
 }
 
-impl<'a, Pk: MiniscriptKey + ToPublicKey, S: Satisfier<Pk>> Satisfier<Pk> for &'a S {
+impl<Pk: MiniscriptKey + ToPublicKey, S: Satisfier<Pk>> Satisfier<Pk> for &'_ S {
     fn lookup_ecdsa_sig(&self, p: &Pk) -> Option<bitcoin::ecdsa::Signature> {
         (**self).lookup_ecdsa_sig(p)
     }
@@ -319,7 +319,7 @@ impl<'a, Pk: MiniscriptKey + ToPublicKey, S: Satisfier<Pk>> Satisfier<Pk> for &'
     fn check_after(&self, n: absolute::LockTime) -> bool { (**self).check_after(n) }
 }
 
-impl<'a, Pk: MiniscriptKey + ToPublicKey, S: Satisfier<Pk>> Satisfier<Pk> for &'a mut S {
+impl<Pk: MiniscriptKey + ToPublicKey, S: Satisfier<Pk>> Satisfier<Pk> for &'_ mut S {
     fn lookup_ecdsa_sig(&self, p: &Pk) -> Option<bitcoin::ecdsa::Signature> {
         (**self).lookup_ecdsa_sig(p)
     }

src/policy/concrete.rs

@@ -1044,7 +1044,7 @@ fn generate_combination<Pk: MiniscriptKey>(
     ret
 }
 
-impl<'a, Pk: MiniscriptKey> TreeLike for &'a Policy<Pk> {
+impl<Pk: MiniscriptKey> TreeLike for &'_ Policy<Pk> {
     fn as_node(&self) -> Tree<Self> {
         use Policy::*;
 

src/policy/semantic.rs

@@ -619,7 +619,7 @@ impl<Pk: MiniscriptKey> Policy<Pk> {
     }
 }
 
-impl<'a, Pk: MiniscriptKey> TreeLike for &'a Policy<Pk> {
+impl<Pk: MiniscriptKey> TreeLike for &'_ Policy<Pk> {
     fn as_node(&self) -> Tree<Self> {
         use Policy::*;
 

src/primitives/threshold.rs

@@ -211,7 +211,7 @@ impl<T, const MAX: usize> Threshold<T, MAX> {
     pub fn into_data(self) -> Vec<T> { self.inner }
 
     /// Passthrough to an iterator on the underlying vector.
-    pub fn iter(&self) -> core::slice::Iter<T> { self.inner.iter() }
+    pub fn iter(&self) -> core::slice::Iter<'_, T> { self.inner.iter() }
 }
 
 impl<T> Threshold<T, 0> {