f - fixed unused mut warnings in c_bindings

Author: jkczyz

lightning/src/offers/invoice_request.rs

@@ -224,7 +224,7 @@ macro_rules! invoice_request_derived_payer_id_builder_methods { (
 } }
 
 macro_rules! invoice_request_builder_methods { (
-	$self: ident, $self_type: ty, $return_type: ty, $return_value: expr, $secp_context: ty
+	$self: ident, $self_type: ty, $return_type: ty, $return_value: expr, $secp_context: ty $(, $self_mut: tt)?
 ) => {
 	fn create_contents(offer: &Offer, metadata: Metadata) -> InvoiceRequestContentsWithoutPayerId {
 		let offer = offer.contents.clone();
@@ -248,7 +248,7 @@ macro_rules! invoice_request_builder_methods { (
 	/// offer.
 	///
 	/// Successive calls to this method will override the previous setting.
-	pub(crate) fn chain_hash(mut $self: $self_type, chain: ChainHash) -> Result<$return_type, Bolt12SemanticError> {
+	pub(crate) fn chain_hash($($self_mut)* $self: $self_type, chain: ChainHash) -> Result<$return_type, Bolt12SemanticError> {
 		if !$self.offer.supports_chain(chain) {
 			return Err(Bolt12SemanticError::UnsupportedChain);
 		}
@@ -263,7 +263,7 @@ macro_rules! invoice_request_builder_methods { (
 	/// Successive calls to this method will override the previous setting.
 	///
 	/// [`quantity`]: Self::quantity
-	pub fn amount_msats(mut $self: $self_type, amount_msats: u64) -> Result<$return_type, Bolt12SemanticError> {
+	pub fn amount_msats($($self_mut)* $self: $self_type, amount_msats: u64) -> Result<$return_type, Bolt12SemanticError> {
 		$self.invoice_request.offer.check_amount_msats_for_quantity(
 			Some(amount_msats), $self.invoice_request.quantity
 		)?;
@@ -275,7 +275,7 @@ macro_rules! invoice_request_builder_methods { (
 	/// does not conform to [`Offer::is_valid_quantity`].
 	///
 	/// Successive calls to this method will override the previous setting.
-	pub fn quantity(mut $self: $self_type, quantity: u64) -> Result<$return_type, Bolt12SemanticError> {
+	pub fn quantity($($self_mut)* $self: $self_type, quantity: u64) -> Result<$return_type, Bolt12SemanticError> {
 		$self.invoice_request.offer.check_quantity(Some(quantity))?;
 		$self.invoice_request.quantity = Some(quantity);
 		Ok($return_value)
@@ -284,12 +284,12 @@ macro_rules! invoice_request_builder_methods { (
 	/// Sets the [`InvoiceRequest::payer_note`].
 	///
 	/// Successive calls to this method will override the previous setting.
-	pub fn payer_note(mut $self: $self_type, payer_note: String) -> $return_type {
+	pub fn payer_note($($self_mut)* $self: $self_type, payer_note: String) -> $return_type {
 		$self.invoice_request.payer_note = Some(payer_note);
 		$return_value
 	}
 
-	fn build_with_checks(mut $self: $self_type) -> Result<
+	fn build_with_checks($($self_mut)* $self: $self_type) -> Result<
 		(UnsignedInvoiceRequest, Option<KeyPair>, Option<&'b Secp256k1<$secp_context>>),
 		Bolt12SemanticError
 	> {
@@ -320,7 +320,7 @@ macro_rules! invoice_request_builder_methods { (
 		Ok($self.build_without_checks())
 	}
 
-	fn build_without_checks(mut $self: $self_type) ->
+	fn build_without_checks($($self_mut)* $self: $self_type) ->
 		(UnsignedInvoiceRequest, Option<KeyPair>, Option<&'b Secp256k1<$secp_context>>)
 	{
 		// Create the metadata for stateless verification of a Bolt12Invoice.
@@ -366,25 +366,25 @@ macro_rules! invoice_request_builder_methods { (
 
 #[cfg(test)]
 macro_rules! invoice_request_builder_test_methods { (
-	$self: ident, $self_type: ty, $return_type: ty, $return_value: expr
+	$self: ident, $self_type: ty, $return_type: ty, $return_value: expr $(, $self_mut: tt)?
 ) => {
-	fn chain_unchecked(mut $self: $self_type, network: Network) -> $return_type {
+	fn chain_unchecked($($self_mut)* $self: $self_type, network: Network) -> $return_type {
 		let chain = ChainHash::using_genesis_block(network);
 		$self.invoice_request.chain = Some(chain);
 		$return_value
 	}
 
-	fn amount_msats_unchecked(mut $self: $self_type, amount_msats: u64) -> $return_type {
+	fn amount_msats_unchecked($($self_mut)* $self: $self_type, amount_msats: u64) -> $return_type {
 		$self.invoice_request.amount_msats = Some(amount_msats);
 		$return_value
 	}
 
-	fn features_unchecked(mut $self: $self_type, features: InvoiceRequestFeatures) -> $return_type {
+	fn features_unchecked($($self_mut)* $self: $self_type, features: InvoiceRequestFeatures) -> $return_type {
 		$self.invoice_request.features = features;
 		$return_value
 	}
 
-	fn quantity_unchecked(mut $self: $self_type, quantity: u64) -> $return_type {
+	fn quantity_unchecked($($self_mut)* $self: $self_type, quantity: u64) -> $return_type {
 		$self.invoice_request.quantity = Some(quantity);
 		$return_value
 	}
@@ -403,10 +403,10 @@ impl<'a, 'b, T: secp256k1::Signing> InvoiceRequestBuilder<'a, 'b, DerivedPayerId
 }
 
 impl<'a, 'b, P: PayerIdStrategy, T: secp256k1::Signing> InvoiceRequestBuilder<'a, 'b, P, T> {
-	invoice_request_builder_methods!(self, Self, Self, self, T);
+	invoice_request_builder_methods!(self, Self, Self, self, T, mut);
 
 	#[cfg(test)]
-	invoice_request_builder_test_methods!(self, Self, Self, self);
+	invoice_request_builder_test_methods!(self, Self, Self, self, mut);
 }
 
 #[cfg(all(c_bindings, not(test)))]
@@ -498,13 +498,15 @@ impl UnsignedInvoiceRequest {
 	}
 }
 
-macro_rules! unsigned_invoice_request_sign_method { ($self: ident, $self_type: ty) => {
+macro_rules! unsigned_invoice_request_sign_method { (
+	$self: ident, $self_type: ty $(, $self_mut: tt)?
+) => {
 	/// Signs the [`TaggedHash`] of the invoice request using the given function.
 	///
 	/// Note: The hash computation may have included unknown, odd TLV records.
 	///
 	/// This is not exported to bindings users as functions are not yet mapped.
-	pub fn sign<F, E>(mut $self: $self_type, sign: F) -> Result<InvoiceRequest, SignError<E>>
+	pub fn sign<F, E>($($self_mut)* $self: $self_type, sign: F) -> Result<InvoiceRequest, SignError<E>>
 	where
 		F: FnOnce(&Self) -> Result<Signature, E>
 	{
@@ -533,7 +535,7 @@ macro_rules! unsigned_invoice_request_sign_method { ($self: ident, $self_type: t
 
 #[cfg(not(c_bindings))]
 impl UnsignedInvoiceRequest {
-	unsigned_invoice_request_sign_method!(self, Self);
+	unsigned_invoice_request_sign_method!(self, Self, mut);
 }
 
 #[cfg(c_bindings)]