From: Matt Corallo <git@bluematt.me>
Date: Sat, 9 Oct 2021 20:14:13 +0000 (+0000)
Subject: Fix loop label shadowing warning
X-Git-Tag: v0.0.102~8^2
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=refs%2Fheads%2F2021-10-test-local-chan-routing;p=rust-lightning

Fix loop label shadowing warning
---

diff --git a/lightning/src/util/events.rs b/lightning/src/util/events.rs
index 37c64364b..08fc164f4 100644
--- a/lightning/src/util/events.rs
+++ b/lightning/src/util/events.rs
@@ -480,23 +480,29 @@ impl MaybeReadable for Event {
 				f()
 			},
 			9u8 => {
-				let mut channel_id = [0; 32];
-				let mut reason = None;
-				read_tlv_fields!(reader, {
-					(0, channel_id, required),
-					(2, reason, ignorable),
-				});
-				if reason.is_none() { return Ok(None); }
-				Ok(Some(Event::ChannelClosed { channel_id, reason: reason.unwrap() }))
+				let f = || {
+					let mut channel_id = [0; 32];
+					let mut reason = None;
+					read_tlv_fields!(reader, {
+						(0, channel_id, required),
+						(2, reason, ignorable),
+					});
+					if reason.is_none() { return Ok(None); }
+					Ok(Some(Event::ChannelClosed { channel_id, reason: reason.unwrap() }))
+				};
+				f()
 			},
 			11u8 => {
-				let mut channel_id = [0; 32];
-				let mut transaction = Transaction{ version: 2, lock_time: 0, input: Vec::new(), output: Vec::new() };
-				read_tlv_fields!(reader, {
-					(0, channel_id, required),
-					(2, transaction, required),
-				});
-				Ok(Some(Event::DiscardFunding { channel_id, transaction } ))
+				let f = || {
+					let mut channel_id = [0; 32];
+					let mut transaction = Transaction{ version: 2, lock_time: 0, input: Vec::new(), output: Vec::new() };
+					read_tlv_fields!(reader, {
+						(0, channel_id, required),
+						(2, transaction, required),
+					});
+					Ok(Some(Event::DiscardFunding { channel_id, transaction } ))
+				};
+				f()
 			},
 			// Versions prior to 0.0.100 did not ignore odd types, instead returning InvalidValue.
 			// Version 0.0.100 failed to properly ignore odd types, possibly resulting in corrupt