fix spacing

Author: TheBlueMatt

c-bindings-gen/src/main.rs

@@ -71,9 +71,13 @@ fn print_method_params<W: std::io::Write>(w: &mut W, sig: &syn::Signature, assoc
 			syn::FnArg::Receiver(recv) => {
 				if !recv.attrs.is_empty() || recv.reference.is_none() { unimplemented!(); }
 				if recv.reference.as_ref().unwrap().1.is_some() { unimplemented!(); }
-				write!(w, "this_arg: {}{} {}",
-					if self_ptr && recv.mutability.is_some() { "*" } else if self_ptr { "*const " } else { "&" },
-					if recv.mutability.is_some() { "mut " } else { "" }, this_param).unwrap();
+				write!(w, "this_arg: {}{}",
+					match (self_ptr, recv.mutability.is_some()) {
+						(true, true) => "*mut ",
+						(true, false) => "*const ",
+						(false, true) => "&mut ",
+						(false, false) => "&",
+					}, this_param).unwrap();
 				assert!(first_arg);
 				first_arg = false;
 			},

lightning-c-bindings/src/chain/chaininterface.rs

@@ -50,7 +50,7 @@ impl ChainError {
 pub struct BroadcasterInterface {
 	pub this_arg: *mut c_void,
 	/// " Sends a transaction out to (hopefully) be mined."
-	pub broadcast_transaction: extern "C" fn (this_arg: *const  c_void, tx: crate::c_types::Transaction),
+	pub broadcast_transaction: extern "C" fn (this_arg: *const c_void, tx: crate::c_types::Transaction),
 }
 unsafe impl Sync for BroadcasterInterface {}
 unsafe impl Send for BroadcasterInterface {}
@@ -118,7 +118,7 @@ pub struct FeeEstimator {
 	/// " This translates to:"
 	/// "  * satoshis-per-byte * 250"
 	/// "  * ceil(satoshis-per-kbyte / 4)"
-	pub get_est_sat_per_1000_weight: extern "C" fn (this_arg: *const  c_void, confirmation_target: ConfirmationTarget) -> u64,
+	pub get_est_sat_per_1000_weight: extern "C" fn (this_arg: *const c_void, confirmation_target: ConfirmationTarget) -> u64,
 }
 unsafe impl Sync for FeeEstimator {}
 unsafe impl Send for FeeEstimator {}

lightning-c-bindings/src/chain/keysinterface.rs

@@ -141,17 +141,17 @@ impl std::ops::Deref for ChannelKeys {
 pub struct KeysInterface {
 	pub this_arg: *mut c_void,
 	/// " Get node secret key (aka node_id or network_key)"
-	pub get_node_secret: extern "C" fn (this_arg: *const  c_void) -> crate::c_types::SecretKey,
+	pub get_node_secret: extern "C" fn (this_arg: *const c_void) -> crate::c_types::SecretKey,
 	/// " Get destination redeemScript to encumber static protocol exit points."
-	pub get_destination_script: extern "C" fn (this_arg: *const  c_void) -> crate::c_types::Script,
+	pub get_destination_script: extern "C" fn (this_arg: *const c_void) -> crate::c_types::Script,
 	/// " Get shutdown_pubkey to use as PublicKey at channel closure"
-	pub get_shutdown_pubkey: extern "C" fn (this_arg: *const  c_void) -> crate::c_types::PublicKey,
+	pub get_shutdown_pubkey: extern "C" fn (this_arg: *const c_void) -> crate::c_types::PublicKey,
 	//XXX: Need to export get_channel_keys
 	//XXX: Need to export get_onion_rand
 	/// " Get a unique temporary channel id. Channels will be referred to by this until the funding"
 	/// " transaction is created, at which point they will use the outpoint in the funding"
 	/// " transaction."
-	pub get_channel_id: extern "C" fn (this_arg: *const  c_void) -> crate::c_types::ThirtyTwoBytes,
+	pub get_channel_id: extern "C" fn (this_arg: *const c_void) -> crate::c_types::ThirtyTwoBytes,
 }
 unsafe impl Send for KeysInterface {}
 unsafe impl Sync for KeysInterface {}

lightning-c-bindings/src/chain/transaction.rs

@@ -45,7 +45,7 @@ pub extern "C" fn OutPoint_new(txid_arg: [u8; 32], index_arg: u16) -> OutPoint {
 }
 /// " Convert an `OutPoint` to a lightning channel id."
 #[no_mangle]
-pub extern "C" fn OutPoint_to_channel_id(this_arg: & OutPoint) -> crate::c_types::ThirtyTwoBytes {
+pub extern "C" fn OutPoint_to_channel_id(this_arg: &OutPoint) -> crate::c_types::ThirtyTwoBytes {
 	crate::c_types::ThirtyTwoBytes { data: unsafe { &*this_arg.inner }.to_channel_id() }
 }
 

lightning-c-bindings/src/ln/channelmanager.rs

@@ -207,14 +207,14 @@ pub extern "C" fn ChannelManager_new(network: crate::bitcoin::network::Network,
 /// " Force closes a channel, immediately broadcasting the latest local commitment transaction to"
 /// " the chain and rejecting new HTLCs on the given channel."
 #[no_mangle]
-pub extern "C" fn ChannelManager_force_close_channel(this_arg: & ChannelManager, channel_id: *const [u8; 32]) {
+pub extern "C" fn ChannelManager_force_close_channel(this_arg: &ChannelManager, channel_id: *const [u8; 32]) {
 	unsafe { &*this_arg.inner }.force_close_channel(unsafe { &*channel_id})
 }
 
 /// " Force close all channels, immediately broadcasting the latest local commitment transaction"
 /// " for each to the chain and rejecting new HTLCs on each."
 #[no_mangle]
-pub extern "C" fn ChannelManager_force_close_all_channels(this_arg: & ChannelManager) {
+pub extern "C" fn ChannelManager_force_close_all_channels(this_arg: &ChannelManager) {
 	unsafe { &*this_arg.inner }.force_close_all_channels()
 }
 
@@ -223,7 +223,7 @@ pub extern "C" fn ChannelManager_force_close_all_channels(this_arg: & ChannelMan
 /// " Should only really ever be called in response to a PendingHTLCsForwardable event."
 /// " Will likely generate further events."
 #[no_mangle]
-pub extern "C" fn ChannelManager_process_pending_htlc_forwards(this_arg: & ChannelManager) {
+pub extern "C" fn ChannelManager_process_pending_htlc_forwards(this_arg: &ChannelManager) {
 	unsafe { &*this_arg.inner }.process_pending_htlc_forwards()
 }
 
@@ -233,13 +233,13 @@ pub extern "C" fn ChannelManager_process_pending_htlc_forwards(this_arg: & Chann
 /// ""
 /// " This method handles all the details, and must be called roughly once per minute."
 #[no_mangle]
-pub extern "C" fn ChannelManager_timer_chan_freshness_every_min(this_arg: & ChannelManager) {
+pub extern "C" fn ChannelManager_timer_chan_freshness_every_min(this_arg: &ChannelManager) {
 	unsafe { &*this_arg.inner }.timer_chan_freshness_every_min()
 }
 
 /// " Gets the node_id held by this ChannelManager"
 #[no_mangle]
-pub extern "C" fn ChannelManager_get_our_node_id(this_arg: & ChannelManager) -> crate::c_types::PublicKey {
+pub extern "C" fn ChannelManager_get_our_node_id(this_arg: &ChannelManager) -> crate::c_types::PublicKey {
 	crate::c_types::PublicKey::from_rust(&unsafe { &*this_arg.inner }.get_our_node_id())
 }
 

lightning-c-bindings/src/ln/channelmonitor.rs

@@ -234,7 +234,7 @@ impl std::ops::Deref for ManyChannelMonitor {
 /// " Gets the update_id from the latest ChannelMonitorUpdate which was applied to this"
 /// " ChannelMonitor."
 #[no_mangle]
-pub extern "C" fn ChannelMonitor_get_latest_update_id(this_arg: & ChannelMonitor) -> u64 {
+pub extern "C" fn ChannelMonitor_get_latest_update_id(this_arg: &ChannelMonitor) -> u64 {
 	unsafe { &*this_arg.inner }.get_latest_update_id()
 }
 

lightning-c-bindings/src/ln/msgs.rs

@@ -520,46 +520,46 @@ pub extern "C" fn HTLCFailChannelUpdate_free(this_ptr: HTLCFailChannelUpdate) {
 pub struct ChannelMessageHandler {
 	pub this_arg: *mut c_void,
 	/// " Handle an incoming open_channel message from the given peer."
-	pub handle_open_channel: extern "C" fn (this_arg: *const  c_void, their_node_id: crate::c_types::PublicKey, their_features: crate::ln::features::InitFeatures, msg: &OpenChannel),
+	pub handle_open_channel: extern "C" fn (this_arg: *const c_void, their_node_id: crate::c_types::PublicKey, their_features: crate::ln::features::InitFeatures, msg: &OpenChannel),
 	/// " Handle an incoming accept_channel message from the given peer."
-	pub handle_accept_channel: extern "C" fn (this_arg: *const  c_void, their_node_id: crate::c_types::PublicKey, their_features: crate::ln::features::InitFeatures, msg: &AcceptChannel),
+	pub handle_accept_channel: extern "C" fn (this_arg: *const c_void, their_node_id: crate::c_types::PublicKey, their_features: crate::ln::features::InitFeatures, msg: &AcceptChannel),
 	/// " Handle an incoming funding_created message from the given peer."
-	pub handle_funding_created: extern "C" fn (this_arg: *const  c_void, their_node_id: crate::c_types::PublicKey, msg: &FundingCreated),
+	pub handle_funding_created: extern "C" fn (this_arg: *const c_void, their_node_id: crate::c_types::PublicKey, msg: &FundingCreated),
 	/// " Handle an incoming funding_signed message from the given peer."
-	pub handle_funding_signed: extern "C" fn (this_arg: *const  c_void, their_node_id: crate::c_types::PublicKey, msg: &FundingSigned),
+	pub handle_funding_signed: extern "C" fn (this_arg: *const c_void, their_node_id: crate::c_types::PublicKey, msg: &FundingSigned),
 	/// " Handle an incoming funding_locked message from the given peer."
-	pub handle_funding_locked: extern "C" fn (this_arg: *const  c_void, their_node_id: crate::c_types::PublicKey, msg: &FundingLocked),
+	pub handle_funding_locked: extern "C" fn (this_arg: *const c_void, their_node_id: crate::c_types::PublicKey, msg: &FundingLocked),
 	/// " Handle an incoming shutdown message from the given peer."
-	pub handle_shutdown: extern "C" fn (this_arg: *const  c_void, their_node_id: crate::c_types::PublicKey, msg: &Shutdown),
+	pub handle_shutdown: extern "C" fn (this_arg: *const c_void, their_node_id: crate::c_types::PublicKey, msg: &Shutdown),
 	/// " Handle an incoming closing_signed message from the given peer."
-	pub handle_closing_signed: extern "C" fn (this_arg: *const  c_void, their_node_id: crate::c_types::PublicKey, msg: &ClosingSigned),
+	pub handle_closing_signed: extern "C" fn (this_arg: *const c_void, their_node_id: crate::c_types::PublicKey, msg: &ClosingSigned),
 	/// " Handle an incoming update_add_htlc message from the given peer."
-	pub handle_update_add_htlc: extern "C" fn (this_arg: *const  c_void, their_node_id: crate::c_types::PublicKey, msg: &UpdateAddHTLC),
+	pub handle_update_add_htlc: extern "C" fn (this_arg: *const c_void, their_node_id: crate::c_types::PublicKey, msg: &UpdateAddHTLC),
 	/// " Handle an incoming update_fulfill_htlc message from the given peer."
-	pub handle_update_fulfill_htlc: extern "C" fn (this_arg: *const  c_void, their_node_id: crate::c_types::PublicKey, msg: &UpdateFulfillHTLC),
+	pub handle_update_fulfill_htlc: extern "C" fn (this_arg: *const c_void, their_node_id: crate::c_types::PublicKey, msg: &UpdateFulfillHTLC),
 	/// " Handle an incoming update_fail_htlc message from the given peer."
-	pub handle_update_fail_htlc: extern "C" fn (this_arg: *const  c_void, their_node_id: crate::c_types::PublicKey, msg: &UpdateFailHTLC),
+	pub handle_update_fail_htlc: extern "C" fn (this_arg: *const c_void, their_node_id: crate::c_types::PublicKey, msg: &UpdateFailHTLC),
 	/// " Handle an incoming update_fail_malformed_htlc message from the given peer."
-	pub handle_update_fail_malformed_htlc: extern "C" fn (this_arg: *const  c_void, their_node_id: crate::c_types::PublicKey, msg: &UpdateFailMalformedHTLC),
+	pub handle_update_fail_malformed_htlc: extern "C" fn (this_arg: *const c_void, their_node_id: crate::c_types::PublicKey, msg: &UpdateFailMalformedHTLC),
 	/// " Handle an incoming commitment_signed message from the given peer."
-	pub handle_commitment_signed: extern "C" fn (this_arg: *const  c_void, their_node_id: crate::c_types::PublicKey, msg: &CommitmentSigned),
+	pub handle_commitment_signed: extern "C" fn (this_arg: *const c_void, their_node_id: crate::c_types::PublicKey, msg: &CommitmentSigned),
 	/// " Handle an incoming revoke_and_ack message from the given peer."
-	pub handle_revoke_and_ack: extern "C" fn (this_arg: *const  c_void, their_node_id: crate::c_types::PublicKey, msg: &RevokeAndACK),
+	pub handle_revoke_and_ack: extern "C" fn (this_arg: *const c_void, their_node_id: crate::c_types::PublicKey, msg: &RevokeAndACK),
 	/// " Handle an incoming update_fee message from the given peer."
-	pub handle_update_fee: extern "C" fn (this_arg: *const  c_void, their_node_id: crate::c_types::PublicKey, msg: &UpdateFee),
+	pub handle_update_fee: extern "C" fn (this_arg: *const c_void, their_node_id: crate::c_types::PublicKey, msg: &UpdateFee),
 	/// " Handle an incoming announcement_signatures message from the given peer."
-	pub handle_announcement_signatures: extern "C" fn (this_arg: *const  c_void, their_node_id: crate::c_types::PublicKey, msg: &AnnouncementSignatures),
+	pub handle_announcement_signatures: extern "C" fn (this_arg: *const c_void, their_node_id: crate::c_types::PublicKey, msg: &AnnouncementSignatures),
 	/// " Indicates a connection to the peer failed/an existing connection was lost. If no connection"
 	/// " is believed to be possible in the future (eg they're sending us messages we don't"
 	/// " understand or indicate they require unknown feature bits), no_connection_possible is set"
 	/// " and any outstanding channels should be failed."
-	pub peer_disconnected: extern "C" fn (this_arg: *const  c_void, their_node_id: crate::c_types::PublicKey, no_connection_possible: bool),
+	pub peer_disconnected: extern "C" fn (this_arg: *const c_void, their_node_id: crate::c_types::PublicKey, no_connection_possible: bool),
 	/// " Handle a peer reconnecting, possibly generating channel_reestablish message(s)."
-	pub peer_connected: extern "C" fn (this_arg: *const  c_void, their_node_id: crate::c_types::PublicKey, msg: &Init),
+	pub peer_connected: extern "C" fn (this_arg: *const c_void, their_node_id: crate::c_types::PublicKey, msg: &Init),
 	/// " Handle an incoming channel_reestablish message from the given peer."
-	pub handle_channel_reestablish: extern "C" fn (this_arg: *const  c_void, their_node_id: crate::c_types::PublicKey, msg: &ChannelReestablish),
+	pub handle_channel_reestablish: extern "C" fn (this_arg: *const c_void, their_node_id: crate::c_types::PublicKey, msg: &ChannelReestablish),
 	/// " Handle an incoming error message from the given peer."
-	pub handle_error: extern "C" fn (this_arg: *const  c_void, their_node_id: crate::c_types::PublicKey, msg: &ErrorMessage),
+	pub handle_error: extern "C" fn (this_arg: *const c_void, their_node_id: crate::c_types::PublicKey, msg: &ErrorMessage),
 	pub MessageSendEventsProvider: crate::util::events::MessageSendEventsProvider,
 }
 impl lightning::util::events::MessageSendEventsProvider for ChannelMessageHandler {
@@ -650,7 +650,7 @@ pub struct RoutingMessageHandler {
 	//XXX: Need to export get_next_channel_announcements
 	//XXX: Need to export get_next_node_announcements
 	/// " Returns whether a full sync should be requested from a peer."
-	pub should_request_full_sync: extern "C" fn (this_arg: *const  c_void, node_id: crate::c_types::PublicKey) -> bool,
+	pub should_request_full_sync: extern "C" fn (this_arg: *const c_void, node_id: crate::c_types::PublicKey) -> bool,
 }
 unsafe impl Send for RoutingMessageHandler {}
 unsafe impl Sync for RoutingMessageHandler {}

lightning-c-bindings/src/ln/peer_handler.rs

@@ -87,13 +87,13 @@ pub struct SocketDescriptor {
 	/// " events should be paused to prevent DoS in the send buffer), resume_read may be set"
 	/// " indicating that read events on this descriptor should resume. A resume_read of false does"
 	/// " *not* imply that further read events should be paused."
-	pub send_data: extern "C" fn (this_arg: *mut  c_void, data: crate::c_types::u8slice, resume_read: bool) -> usize,
+	pub send_data: extern "C" fn (this_arg: *mut c_void, data: crate::c_types::u8slice, resume_read: bool) -> usize,
 	/// " Disconnect the socket pointed to by this SocketDescriptor. Once this function returns, no"
 	/// " more calls to write_buffer_space_avail, read_event or socket_disconnected may be made with"
 	/// " this descriptor. No socket_disconnected call should be generated as a result of this call,"
 	/// " though races may occur whereby disconnect_socket is called after a call to"
 	/// " socket_disconnected but prior to socket_disconnected returning."
-	pub disconnect_socket: extern "C" fn (this_arg: *mut  c_void),
+	pub disconnect_socket: extern "C" fn (this_arg: *mut c_void),
 	pub eq: extern "C" fn (this_arg: *const c_void, other_arg: *const c_void) -> bool,
 	pub hash: extern "C" fn (this_arg: *const c_void) -> u64,
 }
@@ -177,7 +177,7 @@ pub extern "C" fn PeerManager_new(message_handler: MessageHandler, our_node_secr
 /// " response messages as well as messages generated by calls to handler functions directly (eg"
 /// " functions like ChannelManager::process_pending_htlc_forward or send_payment)."
 #[no_mangle]
-pub extern "C" fn PeerManager_process_events(this_arg: & PeerManager) {
+pub extern "C" fn PeerManager_process_events(this_arg: &PeerManager) {
 	unsafe { &*this_arg.inner }.process_events()
 }
 
@@ -190,15 +190,15 @@ pub extern "C" fn PeerManager_process_events(this_arg: & PeerManager) {
 /// ""
 /// " Panics if the descriptor was not previously registered in a successful new_*_connection event."
 #[no_mangle]
-pub extern "C" fn PeerManager_socket_disconnected(this_arg: & PeerManager, descriptor: & SocketDescriptor) {
+pub extern "C" fn PeerManager_socket_disconnected(this_arg: &PeerManager, descriptor: & SocketDescriptor) {
 	unsafe { &*this_arg.inner }.socket_disconnected(descriptor)
 }
 
 /// " This function should be called roughly once every 30 seconds."
 /// " It will send pings to each peer and disconnect those which did not respond to the last round of pings."
 /// " Will most likely call send_data on all of the registered descriptors, thus, be very careful with reentrancy issues!"
 #[no_mangle]
-pub extern "C" fn PeerManager_timer_tick_occured(this_arg: & PeerManager) {
+pub extern "C" fn PeerManager_timer_tick_occured(this_arg: &PeerManager) {
 	unsafe { &*this_arg.inner }.timer_tick_occured()
 }
 

lightning-c-bindings/src/util/logger.rs

@@ -60,7 +60,7 @@ pub extern "C" fn Level_max() -> Level {
 pub struct Logger {
 	pub this_arg: *mut c_void,
 	/// " Logs the `Record`"
-	pub log: extern "C" fn (this_arg: *const  c_void, record: *const std::os::raw::c_char),
+	pub log: extern "C" fn (this_arg: *const c_void, record: *const std::os::raw::c_char),
 }
 unsafe impl Sync for Logger {}
 unsafe impl Send for Logger {}