rustfmt: apply 'visual' indent style config change

Author: valentinewallace

fuzz/src/chanmon_consistency.rs

@@ -83,11 +83,10 @@ impl ChainWatchInterface for DummyChainWatcher {
 		0
 	}
 
-	fn get_chain_utxo(
-		&self,
-		_genesis_hash: Sha256dHash,
-		_unspent_tx_output_identifier: u64,
-	) -> Result<(Script, u64), ChainError> {
+	fn get_chain_utxo(&self,
+	                  _genesis_hash: Sha256dHash,
+	                  _unspent_tx_output_identifier: u64)
+	                  -> Result<(Script, u64), ChainError> {
 		match self.input.get_slice(2) {
 			Some(&[0, _]) => Err(ChainError::NotSupported),
 			Some(&[1, _]) => Err(ChainError::NotWatched),
@@ -101,10 +100,8 @@ impl ChainWatchInterface for DummyChainWatcher {
 
 #[inline]
 pub fn do_test(data: &[u8]) {
-	let input = Arc::new(InputData {
-		data: data.to_vec(),
-		read_pos: AtomicUsize::new(0),
-	});
+	let input = Arc::new(InputData { data: data.to_vec(),
+	                                 read_pos: AtomicUsize::new(0) });
 	macro_rules! get_slice_nonadvancing {
 		($len: expr) => {
 			match input.get_slice_nonadvancing($len as usize) {
@@ -159,9 +156,7 @@ pub fn do_test(data: &[u8]) {
 	}
 
 	let logger: Arc<dyn Logger> = Arc::new(test_logger::TestLogger::new("".to_owned()));
-	let chain_monitor = Arc::new(DummyChainWatcher {
-		input: Arc::clone(&input),
-	});
+	let chain_monitor = Arc::new(DummyChainWatcher { input: Arc::clone(&input) });
 
 	let our_pubkey = get_pubkey!();
 	let router = Router::new(our_pubkey.clone(), chain_monitor, Arc::clone(&logger));
@@ -171,7 +166,8 @@ pub fn do_test(data: &[u8]) {
 			0 => {
 				let start_len = slice_to_be16(&get_slice_nonadvancing!(64 + 2)[64..64 + 2]) as usize;
 				let addr_len = slice_to_be16(
-					&get_slice_nonadvancing!(64 + start_len + 2 + 74)[64 + start_len + 2 + 72..64 + start_len + 2 + 74],
+				                             &get_slice_nonadvancing!(64 + start_len + 2 + 74)
+					                             [64 + start_len + 2 + 72..64 + start_len + 2 + 74],
 				);
 				if addr_len > (37 + 1) * 4 {
 					return;
@@ -211,16 +207,18 @@ pub fn do_test(data: &[u8]) {
 					1 => {
 						let count = slice_to_be16(get_slice!(2));
 						for _ in 0..count {
-							first_hops_vec.push(ChannelDetails {
-								channel_id: [0; 32],
-								short_channel_id: Some(slice_to_be64(get_slice!(8))),
-								remote_network_id: get_pubkey!(),
-								channel_value_satoshis: slice_to_be64(get_slice!(8)),
-								user_id: 0,
-								inbound_capacity_msat: 0,
-								is_live: true,
-								outbound_capacity_msat: 0,
-							});
+							first_hops_vec.push(ChannelDetails { channel_id: [0; 32],
+							                                     short_channel_id: Some(slice_to_be64(get_slice!(
+								8
+							))),
+							                                     remote_network_id: get_pubkey!(),
+							                                     channel_value_satoshis: slice_to_be64(get_slice!(
+								8
+							)),
+							                                     user_id: 0,
+							                                     inbound_capacity_msat: 0,
+							                                     is_live: true,
+							                                     outbound_capacity_msat: 0, });
 						}
 						Some(&first_hops_vec[..])
 					},
@@ -230,23 +228,21 @@ pub fn do_test(data: &[u8]) {
 				let last_hops = {
 					let count = slice_to_be16(get_slice!(2));
 					for _ in 0..count {
-						last_hops_vec.push(RouteHint {
-							src_node_id: get_pubkey!(),
-							short_channel_id: slice_to_be64(get_slice!(8)),
-							fee_base_msat: slice_to_be32(get_slice!(4)),
-							fee_proportional_millionths: slice_to_be32(get_slice!(4)),
-							cltv_expiry_delta: slice_to_be16(get_slice!(2)),
-							htlc_minimum_msat: slice_to_be64(get_slice!(8)),
-						});
+						last_hops_vec.push(RouteHint { src_node_id: get_pubkey!(),
+						                               short_channel_id: slice_to_be64(get_slice!(8)),
+						                               fee_base_msat: slice_to_be32(get_slice!(4)),
+						                               fee_proportional_millionths: slice_to_be32(get_slice!(4)),
+						                               cltv_expiry_delta: slice_to_be16(get_slice!(2)),
+						                               htlc_minimum_msat: slice_to_be64(get_slice!(8)), });
 					}
 					&last_hops_vec[..]
 				};
 				let _ = router.get_route(
-					&target,
-					first_hops,
-					last_hops,
-					slice_to_be64(get_slice!(8)),
-					slice_to_be32(get_slice!(4)),
+				                         &target,
+				                         first_hops,
+				                         last_hops,
+				                         slice_to_be64(get_slice!(8)),
+				                         slice_to_be32(get_slice!(4)),
 				);
 			},
 			_ => return,

fuzz/src/full_stack.rs

@@ -6,24 +6,22 @@ pub struct TestLogger {
 
 impl TestLogger {
 	pub fn new(_id: String) -> TestLogger {
-		TestLogger {
-			#[cfg(test)]
-			id: _id,
-		}
+		TestLogger { #[cfg(test)]
+		             id: _id }
 	}
 }
 
 impl Logger for TestLogger {
 	fn log(&self, record: &Record) {
 		#[cfg(test)]
 		println!(
-			"{:<5} {} [{} : {}, {}] {}",
-			record.level.to_string(),
-			self.id,
-			record.module_path,
-			record.file,
-			record.line,
-			record.args
+		         "{:<5} {} [{} : {}, {}] {}",
+		         record.level.to_string(),
+		         self.id,
+		         record.module_path,
+		         record.file,
+		         record.line,
+		         record.args
 		);
 		#[cfg(not(test))]
 		let _ = format!("{}", record.args);