Fix clippy::mismatched-lifetime-syntaxes

Hiding a lifetime that's elided elsewhere is confusing.

See: rust-lang/rust#138677

Author: dunxen

lightning-block-sync/src/lib.rs

@@ -78,7 +78,7 @@ pub trait BlockSource: Sync + Send {
 	/// to allow for a more efficient lookup.
 	///
 	/// [`get_header`]: Self::get_header
-	fn get_best_block(&self) -> AsyncBlockSourceResult<(BlockHash, Option<u32>)>;
+	fn get_best_block(&self) -> AsyncBlockSourceResult<'_, (BlockHash, Option<u32>)>;
 }
 
 /// Result type for `BlockSource` requests.

lightning-invoice/src/lib.rs

@@ -1146,7 +1146,7 @@ impl RawBolt11Invoice {
 	/// This is not exported to bindings users as there is not yet a manual mapping for a FilterMap
 	pub fn known_tagged_fields(
 		&self,
-	) -> FilterMap<Iter<RawTaggedField>, fn(&RawTaggedField) -> Option<&TaggedField>> {
+	) -> FilterMap<Iter<'_, RawTaggedField>, fn(&RawTaggedField) -> Option<&TaggedField>> {
 		// For 1.14.0 compatibility: closures' types can't be written an fn()->() in the
 		// function's type signature.
 		// TODO: refactor once impl Trait is available
@@ -1468,7 +1468,7 @@ impl Bolt11Invoice {
 	/// This is not exported to bindings users as there is not yet a manual mapping for a FilterMap
 	pub fn tagged_fields(
 		&self,
-	) -> FilterMap<Iter<RawTaggedField>, fn(&RawTaggedField) -> Option<&TaggedField>> {
+	) -> FilterMap<Iter<'_, RawTaggedField>, fn(&RawTaggedField) -> Option<&TaggedField>> {
 		self.signed_invoice.raw_invoice().known_tagged_fields()
 	}
 
@@ -1480,7 +1480,7 @@ impl Bolt11Invoice {
 	/// Return the description or a hash of it for longer ones
 	///
 	/// This is not exported to bindings users because we don't yet export Bolt11InvoiceDescription
-	pub fn description(&self) -> Bolt11InvoiceDescriptionRef {
+	pub fn description(&self) -> Bolt11InvoiceDescriptionRef<'_> {
 		if let Some(direct) = self.signed_invoice.description() {
 			return Bolt11InvoiceDescriptionRef::Direct(direct);
 		} else if let Some(hash) = self.signed_invoice.description_hash() {

lightning-liquidity/src/events/event_queue.rs

@@ -67,7 +67,7 @@ impl EventQueue {
 	}
 
 	// Returns an [`EventQueueNotifierGuard`] that will notify about new event when dropped.
-	pub fn notifier(&self) -> EventQueueNotifierGuard {
+	pub fn notifier(&self) -> EventQueueNotifierGuard<'_> {
 		EventQueueNotifierGuard(self)
 	}
 }

lightning-liquidity/src/message_queue.rs

@@ -33,7 +33,7 @@ impl MessageQueue {
 		self.pending_msgs_notifier.get_future()
 	}
 
-	pub(crate) fn notifier(&self) -> MessageQueueNotifierGuard {
+	pub(crate) fn notifier(&self) -> MessageQueueNotifierGuard<'_> {
 		MessageQueueNotifierGuard { msg_queue: self, buffer: VecDeque::new() }
 	}
 }

lightning/src/ln/chan_utils.rs

@@ -1035,7 +1035,7 @@ impl ChannelTransactionParameters {
 	///
 	/// self.is_populated() must be true before calling this function.
 	#[rustfmt::skip]
-	pub fn as_holder_broadcastable(&self) -> DirectedChannelTransactionParameters {
+	pub fn as_holder_broadcastable(&self) -> DirectedChannelTransactionParameters<'_> {
 		assert!(self.is_populated(), "self.late_parameters must be set before using as_holder_broadcastable");
 		DirectedChannelTransactionParameters {
 			inner: self,
@@ -1048,7 +1048,7 @@ impl ChannelTransactionParameters {
 	///
 	/// self.is_populated() must be true before calling this function.
 	#[rustfmt::skip]
-	pub fn as_counterparty_broadcastable(&self) -> DirectedChannelTransactionParameters {
+	pub fn as_counterparty_broadcastable(&self) -> DirectedChannelTransactionParameters<'_> {
 		assert!(self.is_populated(), "self.late_parameters must be set before using as_counterparty_broadcastable");
 		DirectedChannelTransactionParameters {
 			inner: self,
@@ -1435,7 +1435,7 @@ impl ClosingTransaction {
 	///
 	/// This should only be used if you fully trust the builder of this object. It should not
 	/// be used by an external signer - instead use the verify function.
-	pub fn trust(&self) -> TrustedClosingTransaction {
+	pub fn trust(&self) -> TrustedClosingTransaction<'_> {
 		TrustedClosingTransaction { inner: self }
 	}
 
@@ -1446,7 +1446,7 @@ impl ClosingTransaction {
 	/// An external validating signer must call this method before signing
 	/// or using the built transaction.
 	#[rustfmt::skip]
-	pub fn verify(&self, funding_outpoint: OutPoint) -> Result<TrustedClosingTransaction, ()> {
+	pub fn verify(&self, funding_outpoint: OutPoint) -> Result<TrustedClosingTransaction<'_>, ()> {
 		let built = build_closing_transaction(
 			self.to_holder_value_sat, self.to_counterparty_value_sat,
 			self.to_holder_script.clone(), self.to_counterparty_script.clone(),
@@ -1971,7 +1971,7 @@ impl CommitmentTransaction {
 	///
 	/// This should only be used if you fully trust the builder of this object.  It should not
 	/// be used by an external signer - instead use the verify function.
-	pub fn trust(&self) -> TrustedCommitmentTransaction {
+	pub fn trust(&self) -> TrustedCommitmentTransaction<'_> {
 		TrustedCommitmentTransaction { inner: self }
 	}
 
@@ -1982,7 +1982,7 @@ impl CommitmentTransaction {
 	/// An external validating signer must call this method before signing
 	/// or using the built transaction.
 	#[rustfmt::skip]
-	pub fn verify<T: secp256k1::Signing + secp256k1::Verification>(&self, channel_parameters: &DirectedChannelTransactionParameters, secp_ctx: &Secp256k1<T>) -> Result<TrustedCommitmentTransaction, ()> {
+	pub fn verify<T: secp256k1::Signing + secp256k1::Verification>(&self, channel_parameters: &DirectedChannelTransactionParameters, secp_ctx: &Secp256k1<T>) -> Result<TrustedCommitmentTransaction<'_>, ()> {
 		// This is the only field of the key cache that we trust
 		let per_commitment_point = &self.keys.per_commitment_point;
 		let keys = TxCreationKeys::from_channel_static_keys(per_commitment_point, channel_parameters.broadcaster_pubkeys(), channel_parameters.countersignatory_pubkeys(), secp_ctx);

lightning/src/ln/channel.rs

@@ -4534,7 +4534,7 @@ where
 	/// which peer generated this transaction and "to whom" this transaction flows.
 	#[inline]
 	#[rustfmt::skip]
-	fn build_commitment_transaction<L: Deref>(&self, funding: &FundingScope, commitment_number: u64, per_commitment_point: &PublicKey, local: bool, generated_by_local: bool, logger: &L) -> CommitmentData
+	fn build_commitment_transaction<L: Deref>(&self, funding: &FundingScope, commitment_number: u64, per_commitment_point: &PublicKey, local: bool, generated_by_local: bool, logger: &L) -> CommitmentData<'_>
 		where L::Target: Logger
 	{
 		let broadcaster_dust_limit_sat = if local { self.holder_dust_limit_satoshis } else { self.counterparty_dust_limit_satoshis };
@@ -11817,7 +11817,7 @@ where
 		}
 	}
 
-	pub fn remove_legacy_scids_before_block(&mut self, height: u32) -> alloc::vec::Drain<u64> {
+	pub fn remove_legacy_scids_before_block(&mut self, height: u32) -> alloc::vec::Drain<'_, u64> {
 		let end = self
 			.funding
 			.get_short_channel_id()

lightning/src/ln/channelmanager.rs

@@ -11897,9 +11897,9 @@ where
 	L::Target: Logger,
 {
 	#[cfg(not(c_bindings))]
-	create_offer_builder!(self, OfferBuilder<DerivedMetadata, secp256k1::All>);
+	create_offer_builder!(self, OfferBuilder<'_, DerivedMetadata, secp256k1::All>);
 	#[cfg(not(c_bindings))]
-	create_refund_builder!(self, RefundBuilder<secp256k1::All>);
+	create_refund_builder!(self, RefundBuilder<'_, secp256k1::All>);
 
 	#[cfg(c_bindings)]
 	create_offer_builder!(self, OfferWithDerivedMetadataBuilder);

lightning/src/ln/functional_test_utils.rs

@@ -718,7 +718,7 @@ pub trait NodeHolder {
 		<Self::CM as AChannelManager>::MR,
 		<Self::CM as AChannelManager>::L,
 	>;
-	fn chain_monitor(&self) -> Option<&test_utils::TestChainMonitor>;
+	fn chain_monitor(&self) -> Option<&test_utils::TestChainMonitor<'_>>;
 }
 impl<H: NodeHolder> NodeHolder for &H {
 	type CM = H::CM;
@@ -737,7 +737,7 @@ impl<H: NodeHolder> NodeHolder for &H {
 	> {
 		(*self).node()
 	}
-	fn chain_monitor(&self) -> Option<&test_utils::TestChainMonitor> {
+	fn chain_monitor(&self) -> Option<&test_utils::TestChainMonitor<'_>> {
 		(*self).chain_monitor()
 	}
 }
@@ -746,7 +746,7 @@ impl<'a, 'b: 'a, 'c: 'b> NodeHolder for Node<'a, 'b, 'c> {
 	fn node(&self) -> &TestChannelManager<'b, 'c> {
 		&self.node
 	}
-	fn chain_monitor(&self) -> Option<&test_utils::TestChainMonitor> {
+	fn chain_monitor(&self) -> Option<&test_utils::TestChainMonitor<'_>> {
 		Some(self.chain_monitor)
 	}
 }

lightning/src/offers/flow.rs

@@ -525,7 +525,7 @@ where
 
 	fn create_offer_builder_intern<ES: Deref, PF, I>(
 		&self, entropy_source: ES, make_paths: PF,
-	) -> Result<(OfferBuilder<DerivedMetadata, secp256k1::All>, Nonce), Bolt12SemanticError>
+	) -> Result<(OfferBuilder<'_, DerivedMetadata, secp256k1::All>, Nonce), Bolt12SemanticError>
 	where
 		ES::Target: EntropySource,
 		PF: FnOnce(
@@ -580,7 +580,7 @@ where
 	/// [`DefaultMessageRouter`]: crate::onion_message::messenger::DefaultMessageRouter
 	pub fn create_offer_builder<ES: Deref>(
 		&self, entropy_source: ES, peers: Vec<MessageForwardNode>,
-	) -> Result<OfferBuilder<DerivedMetadata, secp256k1::All>, Bolt12SemanticError>
+	) -> Result<OfferBuilder<'_, DerivedMetadata, secp256k1::All>, Bolt12SemanticError>
 	where
 		ES::Target: EntropySource,
 	{
@@ -601,7 +601,7 @@ where
 	/// See [`Self::create_offer_builder`] for more details on usage.
 	pub fn create_offer_builder_using_router<ME: Deref, ES: Deref>(
 		&self, router: ME, entropy_source: ES, peers: Vec<MessageForwardNode>,
-	) -> Result<OfferBuilder<DerivedMetadata, secp256k1::All>, Bolt12SemanticError>
+	) -> Result<OfferBuilder<'_, DerivedMetadata, secp256k1::All>, Bolt12SemanticError>
 	where
 		ME::Target: MessageRouter,
 		ES::Target: EntropySource,
@@ -627,7 +627,7 @@ where
 	#[cfg(async_payments)]
 	pub fn create_async_receive_offer_builder<ES: Deref>(
 		&self, entropy_source: ES, message_paths_to_always_online_node: Vec<BlindedMessagePath>,
-	) -> Result<(OfferBuilder<DerivedMetadata, secp256k1::All>, Nonce), Bolt12SemanticError>
+	) -> Result<(OfferBuilder<'_, DerivedMetadata, secp256k1::All>, Nonce), Bolt12SemanticError>
 	where
 		ES::Target: EntropySource,
 	{
@@ -639,7 +639,7 @@ where
 	fn create_refund_builder_intern<ES: Deref, PF, I>(
 		&self, entropy_source: ES, make_paths: PF, amount_msats: u64, absolute_expiry: Duration,
 		payment_id: PaymentId,
-	) -> Result<RefundBuilder<secp256k1::All>, Bolt12SemanticError>
+	) -> Result<RefundBuilder<'_, secp256k1::All>, Bolt12SemanticError>
 	where
 		ES::Target: EntropySource,
 		PF: FnOnce(
@@ -712,7 +712,7 @@ where
 	pub fn create_refund_builder<ES: Deref>(
 		&self, entropy_source: ES, amount_msats: u64, absolute_expiry: Duration,
 		payment_id: PaymentId, peers: Vec<MessageForwardNode>,
-	) -> Result<RefundBuilder<secp256k1::All>, Bolt12SemanticError>
+	) -> Result<RefundBuilder<'_, secp256k1::All>, Bolt12SemanticError>
 	where
 		ES::Target: EntropySource,
 	{
@@ -751,7 +751,7 @@ where
 	pub fn create_refund_builder_using_router<ES: Deref, ME: Deref>(
 		&self, router: ME, entropy_source: ES, amount_msats: u64, absolute_expiry: Duration,
 		payment_id: PaymentId, peers: Vec<MessageForwardNode>,
-	) -> Result<RefundBuilder<secp256k1::All>, Bolt12SemanticError>
+	) -> Result<RefundBuilder<'_, secp256k1::All>, Bolt12SemanticError>
 	where
 		ME::Target: MessageRouter,
 		ES::Target: EntropySource,

lightning/src/offers/invoice.rs

@@ -836,7 +836,7 @@ macro_rules! invoice_accessors { ($self: ident, $contents: expr) => {
 	/// From [`Offer::description`] or [`Refund::description`].
 	///
 	/// [`Offer::description`]: crate::offers::offer::Offer::description
-	pub fn description(&$self) -> Option<PrintableString> {
+	pub fn description(&$self) -> Option<PrintableString<'_>> {
 		$contents.description()
 	}
 
@@ -854,7 +854,7 @@ macro_rules! invoice_accessors { ($self: ident, $contents: expr) => {
 	/// From [`Offer::issuer`] or [`Refund::issuer`].
 	///
 	/// [`Offer::issuer`]: crate::offers::offer::Offer::issuer
-	pub fn issuer(&$self) -> Option<PrintableString> {
+	pub fn issuer(&$self) -> Option<PrintableString<'_>> {
 		$contents.issuer()
 	}
 
@@ -919,7 +919,7 @@ macro_rules! invoice_accessors { ($self: ident, $contents: expr) => {
 	/// A payer-provided note reflected back in the invoice.
 	///
 	/// From [`InvoiceRequest::payer_note`] or [`Refund::payer_note`].
-	pub fn payer_note(&$self) -> Option<PrintableString> {
+	pub fn payer_note(&$self) -> Option<PrintableString<'_>> {
 		$contents.payer_note()
 	}
 
@@ -1019,7 +1019,7 @@ impl Bolt12Invoice {
 		)
 	}
 
-	pub(crate) fn as_tlv_stream(&self) -> FullInvoiceTlvStreamRef {
+	pub(crate) fn as_tlv_stream(&self) -> FullInvoiceTlvStreamRef<'_> {
 		let (
 			payer_tlv_stream,
 			offer_tlv_stream,
@@ -1127,7 +1127,7 @@ impl InvoiceContents {
 		}
 	}
 
-	fn description(&self) -> Option<PrintableString> {
+	fn description(&self) -> Option<PrintableString<'_>> {
 		match self {
 			InvoiceContents::ForOffer { invoice_request, .. } => {
 				invoice_request.inner.offer.description()
@@ -1154,7 +1154,7 @@ impl InvoiceContents {
 		}
 	}
 
-	fn issuer(&self) -> Option<PrintableString> {
+	fn issuer(&self) -> Option<PrintableString<'_>> {
 		match self {
 			InvoiceContents::ForOffer { invoice_request, .. } => {
 				invoice_request.inner.offer.issuer()
@@ -1220,7 +1220,7 @@ impl InvoiceContents {
 		}
 	}
 
-	fn payer_note(&self) -> Option<PrintableString> {
+	fn payer_note(&self) -> Option<PrintableString<'_>> {
 		match self {
 			InvoiceContents::ForOffer { invoice_request, .. } => invoice_request.payer_note(),
 			InvoiceContents::ForRefund { refund, .. } => refund.payer_note(),
@@ -1315,7 +1315,7 @@ impl InvoiceContents {
 		)
 	}
 
-	fn as_tlv_stream(&self) -> PartialInvoiceTlvStreamRef {
+	fn as_tlv_stream(&self) -> PartialInvoiceTlvStreamRef<'_> {
 		let (payer, offer, invoice_request, experimental_offer, experimental_invoice_request) =
 			match self {
 				InvoiceContents::ForOffer { invoice_request, .. } => {
@@ -1379,7 +1379,7 @@ pub(super) fn filter_fallbacks(chain: ChainHash, fallbacks: &Vec<FallbackAddress
 }
 
 impl InvoiceFields {
-	fn as_tlv_stream(&self) -> (InvoiceTlvStreamRef, ExperimentalInvoiceTlvStreamRef) {
+	fn as_tlv_stream(&self) -> (InvoiceTlvStreamRef<'_>, ExperimentalInvoiceTlvStreamRef) {
 		let features = {
 			if self.features == Bolt12InvoiceFeatures::empty() {
 				None