Switch to nightly rustfmt

Author: tnull

.github/workflows/rust.yml

@@ -38,7 +38,6 @@ jobs:
       - name: Install Rust ${{ matrix.toolchain }} toolchain
         run: |
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile=minimal --default-toolchain ${{ matrix.toolchain }}
-          rustup override set ${{ matrix.toolchain }}
       - name: Check formatting on Rust ${{ matrix.toolchain }}
         if: matrix.check-fmt
         run: rustup component add rustfmt && cargo fmt --all -- --check

rust-toolchain.toml

@@ -0,0 +1,4 @@
+[toolchain]
+channel = "nightly-2025-10-08"
+components = [ "rustfmt" ]
+profile = "minimal"

rustfmt.toml

@@ -4,11 +4,11 @@ hard_tabs = true
 use_field_init_shorthand = true
 max_width = 100
 match_block_trailing_comma = true
-# UNSTABLE: format_code_in_doc_comments = true
-# UNSTABLE: overflow_delimited_expr = true
-# UNSTABLE: comment_width = 100
-# UNSTABLE: format_macro_matchers = true
-# UNSTABLE: format_strings = true
-# UNSTABLE: group_imports = "StdExternalCrate"
-# UNSTABLE: reorder_imports = true
-# UNSTABLE: imports_granularity = "Module"
+format_code_in_doc_comments = true
+overflow_delimited_expr = true
+comment_width = 100
+format_macro_matchers = true
+format_strings = true
+group_imports = "StdExternalCrate"
+reorder_imports = true
+imports_granularity = "Module"

src/builder.rs

@@ -627,10 +627,9 @@ impl NodeBuilder {
 			derive_xprv(config, &seed_bytes, VSS_HARDENED_CHILD_INDEX, Arc::clone(&logger))?;
 
 		let lnurl_auth_xprv = vss_xprv
-			.derive_priv(
-				&Secp256k1::new(),
-				&[ChildNumber::Hardened { index: VSS_LNURL_AUTH_HARDENED_CHILD_INDEX }],
-			)
+			.derive_priv(&Secp256k1::new(), &[ChildNumber::Hardened {
+				index: VSS_LNURL_AUTH_HARDENED_CHILD_INDEX,
+			}])
 			.map_err(|e| {
 				log_error!(logger, "Failed to derive VSS secret: {}", e);
 				BuildError::KVStoreSetupFailed
@@ -1116,7 +1115,12 @@ fn build_with_store_internal(
 
 	if let Err(err) = may_announce_channel(&config) {
 		if config.announcement_addresses.is_some() {
-			log_error!(logger, "Announcement addresses were set but some required configuration options for node announcement are missing: {}", err);
+			log_error!(
+				logger,
+				"Announcement addresses were set but some required configuration options for node \
+				 announcement are missing: {}",
+				err
+			);
 			let build_error = if matches!(err, AnnounceError::MissingNodeAlias) {
 				BuildError::InvalidNodeAlias
 			} else {
@@ -1126,7 +1130,12 @@ fn build_with_store_internal(
 		}
 
 		if config.node_alias.is_some() {
-			log_error!(logger, "Node alias was set but some required configuration options for node announcement are missing: {}", err);
+			log_error!(
+				logger,
+				"Node alias was set but some required configuration options for node announcement \
+				 are missing: {}",
+				err
+			);
 			return Err(BuildError::InvalidListeningAddresses);
 		}
 	}

src/chain/bitcoind.rs

@@ -221,20 +221,22 @@ impl BitcoindChainSource {
 					log_error!(self.logger, "Failed to synchronize chain listeners: {:?}", e);
 					if e.kind() == BlockSourceErrorKind::Transient {
 						log_info!(
-									self.logger,
-									"Transient error syncing chain listeners: {:?}. Retrying in {} seconds.",
-									e,
-									backoff
-								);
+							self.logger,
+							"Transient error syncing chain listeners: {:?}. Retrying in {} \
+							 seconds.",
+							e,
+							backoff
+						);
 						tokio::time::sleep(Duration::from_secs(backoff)).await;
 						backoff = std::cmp::min(backoff * 2, MAX_BACKOFF_SECS);
 					} else {
 						log_error!(
-									self.logger,
-									"Persistent error syncing chain listeners: {:?}. Retrying in {} seconds.",
-									e,
-									MAX_BACKOFF_SECS
-								);
+							self.logger,
+							"Persistent error syncing chain listeners: {:?}. Retrying in {} \
+							 seconds.",
+							e,
+							MAX_BACKOFF_SECS
+						);
 						tokio::time::sleep(Duration::from_secs(MAX_BACKOFF_SECS)).await;
 					}
 				},
@@ -415,7 +417,7 @@ impl BitcoindChainSource {
 
 	pub(super) async fn update_fee_rate_estimates(&self) -> Result<(), Error> {
 		macro_rules! get_fee_rate_update {
-			($estimation_fut: expr) => {{
+			($estimation_fut:expr) => {{
 				let update_res = tokio::time::timeout(
 					Duration::from_secs(FEE_RATE_CACHE_UPDATE_TIMEOUT_SECS),
 					$estimation_fut,
@@ -475,10 +477,11 @@ impl BitcoindChainSource {
 					// On regtest/signet we just fall back to the usual 1 sat/vb == 250
 					// sat/kwu default.
 					log_error!(
-								self.logger,
-								"Failed to retrieve fee rate estimates: {}. Falling back to default of 1 sat/vb.",
-								e,
-							);
+						self.logger,
+						"Failed to retrieve fee rate estimates: {}. Falling back to default of 1 \
+						 sat/vb.",
+						e,
+					);
 					FeeRate::from_sat_per_kwu(250)
 				},
 				(Err(e), _) => {
@@ -701,10 +704,10 @@ impl BitcoindClient {
 		let num_blocks_json = serde_json::json!(num_blocks);
 		let estimation_mode_json = serde_json::json!(estimation_mode);
 		rpc_client
-			.call_method::<FeeResponse>(
-				"estimatesmartfee",
-				&[num_blocks_json, estimation_mode_json],
-			)
+			.call_method::<FeeResponse>("estimatesmartfee", &[
+				num_blocks_json,
+				estimation_mode_json,
+			])
 			.await
 			.map(|resp| resp.0)
 	}

src/chain/electrum.rs

@@ -604,11 +604,15 @@ impl ElectrumRuntimeClient {
 			&& self.config.network == Network::Bitcoin
 		{
 			// Ensure we fail if we didn't receive all estimates.
-			debug_assert!(false,
-				"Electrum server didn't return all expected results. This is disallowed on Mainnet."
+			debug_assert!(
+				false,
+				"Electrum server didn't return all expected results. This is disallowed on \
+				 Mainnet."
 			);
-			log_error!(self.logger,
-				"Failed to retrieve fee rate estimates: Electrum server didn't return all expected results. This is disallowed on Mainnet."
+			log_error!(
+				self.logger,
+				"Failed to retrieve fee rate estimates: Electrum server didn't return all \
+				 expected results. This is disallowed on Mainnet."
 			);
 			return Err(Error::FeerateEstimationUpdateFailed);
 		}

src/chain/esplora.rs

@@ -108,7 +108,7 @@ impl EsploraChainSource {
 			self.node_metrics.read().unwrap().latest_onchain_wallet_sync_timestamp.is_some();
 
 		macro_rules! get_and_apply_wallet_update {
-			($sync_future: expr) => {{
+			($sync_future:expr) => {{
 				let now = Instant::now();
 				match $sync_future.await {
 					Ok(res) => match res {
@@ -124,16 +124,18 @@ impl EsploraChainSource {
 									.duration_since(UNIX_EPOCH)
 									.ok()
 									.map(|d| d.as_secs());
-									{
-										let mut locked_node_metrics = self.node_metrics.write().unwrap();
-										locked_node_metrics.latest_onchain_wallet_sync_timestamp = unix_time_secs_opt;
-										write_node_metrics(
-											&*locked_node_metrics,
-											Arc::clone(&self.kv_store),
-											Arc::clone(&self.logger)
-										)?;
-									}
-									Ok(())
+								{
+									let mut locked_node_metrics =
+										self.node_metrics.write().unwrap();
+									locked_node_metrics.latest_onchain_wallet_sync_timestamp =
+										unix_time_secs_opt;
+									write_node_metrics(
+										&*locked_node_metrics,
+										Arc::clone(&self.kv_store),
+										Arc::clone(&self.logger),
+									)?;
+								}
+								Ok(())
 							},
 							Err(e) => Err(e),
 						},
@@ -178,7 +180,7 @@ impl EsploraChainSource {
 						Err(Error::WalletOperationTimeout)
 					},
 				}
-			}}
+			}};
 		}
 
 		if incremental_sync {
@@ -307,9 +309,10 @@ impl EsploraChainSource {
 		if estimates.is_empty() && self.config.network == Network::Bitcoin {
 			// Ensure we fail if we didn't receive any estimates.
 			log_error!(
-						self.logger,
-						"Failed to retrieve fee rate estimates: empty fee estimates are dissallowed on Mainnet.",
-					);
+				self.logger,
+				"Failed to retrieve fee rate estimates: empty fee estimates are dissallowed on \
+				 Mainnet.",
+			);
 			return Err(Error::FeerateEstimationUpdateFailed);
 		}
 

src/chain/mod.rs

@@ -245,7 +245,8 @@ impl ChainSource {
 					// Background syncing is disabled
 					log_info!(
 						self.logger,
-						"Background syncing is disabled. Manual syncing required for onchain wallet, lightning wallet, and fee rate updates.",
+						"Background syncing is disabled. Manual syncing required for onchain \
+						 wallet, lightning wallet, and fee rate updates.",
 					);
 					return;
 				}
@@ -267,7 +268,8 @@ impl ChainSource {
 					// Background syncing is disabled
 					log_info!(
 						self.logger,
-						"Background syncing is disabled. Manual syncing required for onchain wallet, lightning wallet, and fee rate updates.",
+						"Background syncing is disabled. Manual syncing required for onchain \
+						 wallet, lightning wallet, and fee rate updates.",
 					);
 					return;
 				}

src/error.rs

@@ -193,10 +193,18 @@ impl fmt::Display for Error {
 				write!(f, "The provided offer was denonminated in an unsupported currency.")
 			},
 			Self::LiquiditySourceUnavailable => {
-				write!(f, "The given operation failed due to the required liquidity source being unavailable.")
+				write!(
+					f,
+					"The given operation failed due to the required liquidity source being \
+					 unavailable."
+				)
 			},
 			Self::LiquidityFeeTooHigh => {
-				write!(f, "The given operation failed due to the LSP's required opening fee being too high.")
+				write!(
+					f,
+					"The given operation failed due to the LSP's required opening fee being too \
+					 high."
+				)
 			},
 			Self::InvalidBlindedPaths => write!(f, "The given blinded paths are invalid."),
 			Self::AsyncPaymentServicesDisabled => {