rustfmt: 2nd pass of the formatter, just trimming line width to 120

Author: valentinewallace

fuzz/src/chanmon_consistency.rs

@@ -23,10 +23,13 @@ impl Writer for VecWriter {
 #[inline]
 pub fn do_test(data: &[u8]) {
 	let logger = Arc::new(test_logger::TestLogger::new("".to_owned()));
-	if let Ok((latest_block_hash, monitor)) = <(Sha256dHash, channelmonitor::ChannelMonitor)>::read(&mut Cursor::new(data), logger.clone()) {
+	if let Ok((latest_block_hash, monitor)) =
+		<(Sha256dHash, channelmonitor::ChannelMonitor)>::read(&mut Cursor::new(data), logger.clone())
+	{
 		let mut w = VecWriter(Vec::new());
 		monitor.write_for_disk(&mut w).unwrap();
-		let deserialized_copy = <(Sha256dHash, channelmonitor::ChannelMonitor)>::read(&mut Cursor::new(&w.0), logger.clone()).unwrap();
+		let deserialized_copy =
+			<(Sha256dHash, channelmonitor::ChannelMonitor)>::read(&mut Cursor::new(&w.0), logger.clone()).unwrap();
 		assert!(latest_block_hash == deserialized_copy.0);
 		assert!(monitor == deserialized_copy.1);
 		w.0.clear();
@@ -35,7 +38,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn chanmon_deser_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn chanmon_deser_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/chanmon_deser.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_accept_channel_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_accept_channel_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/full_stack.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_announcement_signatures_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_announcement_signatures_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_accept_channel.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_channel_announcement_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_channel_announcement_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_announcement_signatures.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_channel_reestablish_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_channel_reestablish_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_channel_announcement.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_channel_update_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_channel_update_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_channel_reestablish.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_closing_signed_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_closing_signed_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_channel_update.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_commitment_signed_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_commitment_signed_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_closing_signed.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_decoded_onion_error_packet_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_decoded_onion_error_packet_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_commitment_signed.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_error_message_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_error_message_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_decoded_onion_error_packet.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_funding_created_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_funding_created_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_error_message.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_funding_locked_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_funding_locked_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_funding_created.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_funding_signed_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_funding_signed_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_funding_locked.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_init_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_init_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_funding_signed.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_node_announcement_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_node_announcement_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_init.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_onion_hop_data_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_onion_hop_data_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_node_announcement.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_open_channel_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_open_channel_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_onion_hop_data.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_ping_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_ping_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_open_channel.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_pong_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_pong_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_ping.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_revoke_and_ack_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_revoke_and_ack_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_pong.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_shutdown_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_shutdown_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_revoke_and_ack.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_update_add_htlc_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_update_add_htlc_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_shutdown.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_update_fail_htlc_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_update_fail_htlc_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_update_add_htlc.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_update_fail_malformed_htlc_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_update_fail_malformed_htlc_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_update_fail_htlc.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_update_fee_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_update_fee_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_update_fail_malformed_htlc.rs

@@ -11,7 +11,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn msg_update_fulfill_htlc_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn msg_update_fulfill_htlc_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {

fuzz/src/msg_targets/msg_update_fee.rs

@@ -73,7 +73,9 @@ pub fn do_test(data: &[u8]) {
 }
 
 #[no_mangle]
-pub extern "C" fn peer_crypt_run(data: *const u8, datalen: usize) { do_test(unsafe { std::slice::from_raw_parts(data, datalen) }); }
+pub extern "C" fn peer_crypt_run(data: *const u8, datalen: usize) {
+	do_test(unsafe { std::slice::from_raw_parts(data, datalen) });
+}
 
 #[cfg(test)]
 mod tests {