Apply rustfmt with match_arm_blocks = true

Automated formatting pass to wrap multi-line match arm bodies in braces.

Author: pgherveou

bridges/modules/grandpa/src/call_ext.rs

@@ -248,8 +248,9 @@ pub trait CallSubType<T: Config<I, RuntimeCall = Self>, I: 'static>:
 
 		let result = SubmitFinalityProofHelper::<T, I>::check_obsolete_from_extension(&call_info);
 		match result {
-			Ok(improved_by) =>
-				Ok(Some(VerifiedSubmitFinalityProofInfo { base: call_info, improved_by })),
+			Ok(improved_by) => {
+				Ok(Some(VerifiedSubmitFinalityProofInfo { base: call_info, improved_by }))
+			},
 			Err(Error::<T, I>::OldHeader) => Err(InvalidTransaction::Stale.into()),
 			Err(_) => Err(InvalidTransaction::Call.into()),
 		}

bridges/modules/messages/src/tests/messages_generation.rs

@@ -78,12 +78,13 @@ where
 		for (i, nonce) in message_nonces.into_iter().enumerate() {
 			let message_key = MessageKey { lane_id: lane, nonce };
 			let message_payload = match encode_message(nonce, &generate_message(nonce)) {
-				Some(message_payload) =>
+				Some(message_payload) => {
 					if i == 0 {
 						grow_storage_value(message_payload, &proof_params)
 					} else {
 						message_payload
-					},
+					}
+				},
 				None => continue,
 			};
 			let storage_key = storage_keys::message_key(

bridges/modules/parachains/src/call_ext.rs

@@ -158,12 +158,13 @@ impl<T: Config<I>, I: 'static> SubmitParachainHeadsHelper<T, I> {
 	/// Check if the `SubmitParachainHeads` was successfully executed.
 	pub fn was_successful(update: &SubmitParachainHeadsInfo) -> bool {
 		match crate::ParasInfo::<T, I>::get(update.para_id) {
-			Some(stored_best_head) =>
+			Some(stored_best_head) => {
 				stored_best_head.best_head_hash ==
 					BestParaHeadHash {
 						at_relay_block_number: update.at_relay_block.0,
 						head_hash: update.para_head_hash,
-					},
+					}
+			},
 			None => false,
 		}
 	}

bridges/modules/parachains/src/lib.rs

@@ -530,7 +530,9 @@ pub mod pallet {
 									if at_relay_block.0.saturating_sub(
 										best_head.best_head_hash.at_relay_block_number,
 									) >= free_headers_interval =>
-									true,
+								{
+									true
+								},
 								Some(_) => false,
 								None => true,
 							};

bridges/modules/relayers/src/extension/grandpa_adapter.rs

@@ -109,8 +109,9 @@ where
 			calls.next().transpose()?.and_then(|c| c.submit_finality_proof_info());
 
 		Ok(match (total_calls, relay_finality_call, msgs_call) {
-			(2, Some(relay_finality_call), Some(msgs_call)) =>
-				Some(ExtensionCallInfo::RelayFinalityAndMsgs(relay_finality_call, msgs_call)),
+			(2, Some(relay_finality_call), Some(msgs_call)) => {
+				Some(ExtensionCallInfo::RelayFinalityAndMsgs(relay_finality_call, msgs_call))
+			},
 			(1, None, Some(msgs_call)) => Some(ExtensionCallInfo::Msgs(msgs_call)),
 			_ => None,
 		})

bridges/modules/relayers/src/extension/mod.rs

@@ -407,11 +407,12 @@ where
 					"Has registered reward"
 				);
 			},
-			RelayerAccountAction::Slash(relayer, slash_account) =>
+			RelayerAccountAction::Slash(relayer, slash_account) => {
 				RelayersPallet::<R, C::BridgeRelayersPalletInstance>::slash_and_deregister(
 					&relayer,
 					ExplicitOrAccountParams::Params(slash_account),
-				),
+				)
+			},
 		}
 
 		Ok(Weight::zero())

bridges/modules/relayers/src/extension/parachain_adapter.rs

@@ -122,14 +122,16 @@ where
 		let relay_finality_call =
 			calls.next().transpose()?.and_then(|c| c.submit_finality_proof_info());
 		Ok(match (total_calls, relay_finality_call, para_finality_call, msgs_call) {
-			(3, Some(relay_finality_call), Some(para_finality_call), Some(msgs_call)) =>
+			(3, Some(relay_finality_call), Some(para_finality_call), Some(msgs_call)) => {
 				Some(ExtensionCallInfo::AllFinalityAndMsgs(
 					relay_finality_call,
 					para_finality_call,
 					msgs_call,
-				)),
-			(2, None, Some(para_finality_call), Some(msgs_call)) =>
-				Some(ExtensionCallInfo::ParachainFinalityAndMsgs(para_finality_call, msgs_call)),
+				))
+			},
+			(2, None, Some(para_finality_call), Some(msgs_call)) => {
+				Some(ExtensionCallInfo::ParachainFinalityAndMsgs(para_finality_call, msgs_call))
+			},
 			(1, None, None, Some(msgs_call)) => Some(ExtensionCallInfo::Msgs(msgs_call)),
 			_ => None,
 		})

bridges/modules/xcm-bridge-hub-router/src/lib.rs

@@ -279,7 +279,9 @@ impl<T: Config<I>, I: 'static> ExporterFor for Pallet<T, I> {
 			match T::Bridges::exporter_for(network, remote_location, message) {
 				Some((bridge_hub_location, maybe_payment))
 					if bridge_hub_location.eq(&T::SiblingBridgeHubLocation::get()) =>
-					(bridge_hub_location, maybe_payment),
+				{
+					(bridge_hub_location, maybe_payment)
+				},
 				_ => {
 					tracing::trace!(
 						target: LOG_TARGET,

bridges/modules/xcm-bridge-hub/src/exporter.rs

@@ -159,12 +159,15 @@ where
 		let bridge_message = MessagesPallet::<T, I>::validate_message(bridge.lane_id, &blob)
 			.map_err(|e| {
 				match e {
-					Error::LanesManager(ref ei) =>
-						tracing::error!(target: LOG_TARGET, error=?ei, "LanesManager"),
-					Error::MessageRejectedByPallet(ref ei) =>
-						tracing::error!(target: LOG_TARGET, error=?ei, "MessageRejectedByPallet"),
-					Error::ReceptionConfirmation(ref ei) =>
-						tracing::error!(target: LOG_TARGET, error=?ei, "ReceptionConfirmation"),
+					Error::LanesManager(ref ei) => {
+						tracing::error!(target: LOG_TARGET, error=?ei, "LanesManager")
+					},
+					Error::MessageRejectedByPallet(ref ei) => {
+						tracing::error!(target: LOG_TARGET, error=?ei, "MessageRejectedByPallet")
+					},
+					Error::ReceptionConfirmation(ref ei) => {
+						tracing::error!(target: LOG_TARGET, error=?ei, "ReceptionConfirmation")
+					},
 					_ => (),
 				};
 

bridges/modules/xcm-bridge-hub/src/lib.rs

@@ -758,8 +758,9 @@ pub mod pallet {
 
 				let lane_id = match maybe_lane_id {
 					Some(lane_id) => *lane_id,
-					None =>
-						locations.calculate_lane_id(xcm::latest::VERSION).expect("Valid locations"),
+					None => {
+						locations.calculate_lane_id(xcm::latest::VERSION).expect("Valid locations")
+					},
 				};
 
 				Pallet::<T, I>::do_open_bridge(locations, lane_id, true)