From: Matt Corallo <git@bluematt.me>
Date: Fri, 12 Feb 2021 21:06:14 +0000 (-0500)
Subject: Drop trailing semicolons which rustc nightly generates warnings for
X-Git-Tag: v0.0.13~31^2~2
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=35bb2d00850f7295050bb8de6e4dda770817a33f;p=rust-lightning

Drop trailing semicolons which rustc nightly generates warnings for
---

diff --git a/lightning/src/ln/functional_tests.rs b/lightning/src/ln/functional_tests.rs
index 77b791e01..9ac79aa15 100644
--- a/lightning/src/ln/functional_tests.rs
+++ b/lightning/src/ln/functional_tests.rs
@@ -1583,7 +1583,7 @@ fn test_fee_spike_violation_fails_htlc() {
 			let route = get_route(&nodes[0].node.get_our_node_id(), net_graph_msg_handler, &nodes.last().unwrap().node.get_our_node_id(), None, &Vec::new(), $recv_value, TEST_FINAL_CLTV, &logger).unwrap();
 			(route, payment_hash, payment_preimage)
 		}}
-	};
+	}
 
 	let (route, payment_hash, _) = get_route_and_payment_hash!(3460001);
 	// Need to manually create the update_add_htlc message to go around the channel reserve check in send_htlc()
@@ -1722,7 +1722,7 @@ fn test_chan_reserve_violation_outbound_htlc_inbound_chan() {
 			let route = get_route(&nodes[1].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes.first().unwrap().node.get_our_node_id(), None, &Vec::new(), $recv_value, TEST_FINAL_CLTV, &logger).unwrap();
 			(route, payment_hash, payment_preimage)
 		}}
-	};
+	}
 
 	let (route, our_payment_hash, _) = get_route_and_payment_hash!(1000);
 	unwrap_send_err!(nodes[1].node.send_payment(&route, our_payment_hash, &None), true, APIError::ChannelUnavailable { ref err },
@@ -1754,7 +1754,7 @@ fn test_chan_reserve_violation_inbound_htlc_outbound_channel() {
 			let route = get_route(&nodes[1].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes.first().unwrap().node.get_our_node_id(), None, &Vec::new(), $recv_value, TEST_FINAL_CLTV, &logger).unwrap();
 			(route, payment_hash, payment_preimage)
 		}}
-	};
+	}
 
 	let (route, payment_hash, _) = get_route_and_payment_hash!(1000);
 	// Need to manually create the update_add_htlc message to go around the channel reserve check in send_htlc()
@@ -1799,7 +1799,7 @@ fn test_chan_reserve_violation_inbound_htlc_inbound_chan() {
 			let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes.last().unwrap().node.get_our_node_id(), None, &Vec::new(), $recv_value, TEST_FINAL_CLTV, &logger).unwrap();
 			(route, payment_hash, payment_preimage)
 		}}
-	};
+	}
 
 	let feemsat = 239;
 	let total_routing_fee_msat = (nodes.len() - 2) as u64 * feemsat;
@@ -1900,7 +1900,7 @@ fn test_channel_reserve_holding_cell_htlcs() {
 			let route = get_route(&nodes[0].node.get_our_node_id(), &net_graph_msg_handler.network_graph.read().unwrap(), &nodes.last().unwrap().node.get_our_node_id(), None, &Vec::new(), $recv_value, TEST_FINAL_CLTV, &logger).unwrap();
 			(route, payment_hash, payment_preimage)
 		}}
-	};
+	}
 
 	macro_rules! expect_forward {
 		($node: expr) => {{
diff --git a/lightning/src/util/chacha20.rs b/lightning/src/util/chacha20.rs
index 77329cba4..c23856b60 100644
--- a/lightning/src/util/chacha20.rs
+++ b/lightning/src/util/chacha20.rs
@@ -328,7 +328,7 @@ mod test {
 			key:   [u8; 32],
 			nonce: [u8; 8],
 			keystream: Vec<u8>,
-		};
+		}
 		// taken from http://tools.ietf.org/html/draft-agl-tls-chacha20poly1305-04
 		let test_vectors = vec!(
 			TestVector{
@@ -463,7 +463,7 @@ mod test {
 			key:   [u8; 32],
 			nonce: [u8; 12],
 			keystream: Vec<u8>,
-		};
+		}
 		// taken from http://tools.ietf.org/html/draft-agl-tls-chacha20poly1305-04
 		let test_vectors = vec!(
 			TestVector{