From: Elias Rohrer <dev@tnull.de>
Date: Thu, 6 Jun 2024 11:08:20 +0000 (+0200)
Subject: `rustfmt`: `fuzz/src/indexedmap.rs`
X-Git-Tag: v0.0.124-beta~91^2~12
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=9164e835e52b98ee40ae0874b48dcd02065951ce;p=rust-lightning

`rustfmt`: `fuzz/src/indexedmap.rs`
---

diff --git a/fuzz/src/indexedmap.rs b/fuzz/src/indexedmap.rs
index 58775d024..ee21f0461 100644
--- a/fuzz/src/indexedmap.rs
+++ b/fuzz/src/indexedmap.rs
@@ -7,23 +7,31 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
-use lightning::util::indexed_map::{IndexedMap, self};
-use std::collections::{BTreeMap, btree_map};
 use lightning::util::hash_tables::*;
+use lightning::util::indexed_map::{self, IndexedMap};
+use std::collections::{btree_map, BTreeMap};
 
 use crate::utils::test_logger;
 
-use std::ops::{RangeBounds, Bound};
+use std::ops::{Bound, RangeBounds};
 
 struct ExclLowerInclUpper(u8, u8);
 impl RangeBounds<u8> for ExclLowerInclUpper {
-	fn start_bound(&self) -> Bound<&u8> { Bound::Excluded(&self.0) }
-	fn end_bound(&self) -> Bound<&u8> { Bound::Included(&self.1) }
+	fn start_bound(&self) -> Bound<&u8> {
+		Bound::Excluded(&self.0)
+	}
+	fn end_bound(&self) -> Bound<&u8> {
+		Bound::Included(&self.1)
+	}
 }
 struct ExclLowerExclUpper(u8, u8);
 impl RangeBounds<u8> for ExclLowerExclUpper {
-	fn start_bound(&self) -> Bound<&u8> { Bound::Excluded(&self.0) }
-	fn end_bound(&self) -> Bound<&u8> { Bound::Excluded(&self.1) }
+	fn start_bound(&self) -> Bound<&u8> {
+		Bound::Excluded(&self.0)
+	}
+	fn end_bound(&self) -> Bound<&u8> {
+		Bound::Excluded(&self.1)
+	}
 }
 
 fn check_eq(btree: &BTreeMap<u8, u8>, mut indexed: IndexedMap<u8, u8>) {
@@ -46,36 +54,44 @@ fn check_eq(btree: &BTreeMap<u8, u8>, mut indexed: IndexedMap<u8, u8>) {
 				if let indexed_map::Entry::Occupied(mut io) = indexed_entry {
 					assert_eq!(bo.get(), io.get());
 					assert_eq!(bo.get_mut(), io.get_mut());
-				} else { panic!(); }
+				} else {
+					panic!();
+				}
 			},
 			btree_map::Entry::Vacant(_) => {
 				if let indexed_map::Entry::Vacant(_) = indexed_entry {
-				} else { panic!(); }
-			}
+				} else {
+					panic!();
+				}
+			},
 		}
 	}
 
 	const STRIDE: u8 = 16;
 	for range_type in 0..4 {
-		for k in 0..=255/STRIDE {
+		for k in 0..=255 / STRIDE {
 			let lower_bound = k * STRIDE;
 			let upper_bound = lower_bound + (STRIDE - 1);
-			macro_rules! range { ($map: expr) => {
-				match range_type {
-					0 => $map.range(lower_bound..upper_bound),
-					1 => $map.range(lower_bound..=upper_bound),
-					2 => $map.range(ExclLowerInclUpper(lower_bound, upper_bound)),
-					3 => $map.range(ExclLowerExclUpper(lower_bound, upper_bound)),
-					_ => unreachable!(),
-				}
-			} }
+			macro_rules! range {
+				($map: expr) => {
+					match range_type {
+						0 => $map.range(lower_bound..upper_bound),
+						1 => $map.range(lower_bound..=upper_bound),
+						2 => $map.range(ExclLowerInclUpper(lower_bound, upper_bound)),
+						3 => $map.range(ExclLowerExclUpper(lower_bound, upper_bound)),
+						_ => unreachable!(),
+					}
+				};
+			}
 			let mut btree_iter = range!(btree);
 			let mut indexed_iter = range!(indexed);
 			loop {
 				let b_v = btree_iter.next();
 				let i_v = indexed_iter.next();
 				assert_eq!(b_v, i_v);
-				if b_v.is_none() { break; }
+				if b_v.is_none() {
+					break;
+				}
 			}
 		}
 	}
@@ -104,7 +120,9 @@ fn check_eq(btree: &BTreeMap<u8, u8>, mut indexed: IndexedMap<u8, u8>) {
 
 #[inline]
 pub fn do_test(data: &[u8]) {
-	if data.len() % 2 != 0 { return; }
+	if data.len() % 2 != 0 {
+		return;
+	}
 	let mut btree = BTreeMap::new();
 	let mut indexed = IndexedMap::new();
 
@@ -138,13 +156,17 @@ pub fn do_test(data: &[u8]) {
 					} else {
 						assert_eq!(bo.remove_entry(), io.remove_entry());
 					}
-				} else { panic!(); }
+				} else {
+					panic!();
+				}
 			},
 			btree_map::Entry::Vacant(bv) => {
 				if let indexed_map::Entry::Vacant(iv) = indexed.entry(k) {
 					bv.insert(k);
 					iv.insert(k);
-				} else { panic!(); }
+				} else {
+					panic!();
+				}
 			},
 		}
 	}
diff --git a/rustfmt_excluded_files b/rustfmt_excluded_files
index de5e19673..6c4c2dd90 100644
--- a/rustfmt_excluded_files
+++ b/rustfmt_excluded_files
@@ -1,7 +1,6 @@
 ./bench/benches/bench.rs
 ./fuzz/src/chanmon_consistency.rs
 ./fuzz/src/full_stack.rs
-./fuzz/src/indexedmap.rs
 ./fuzz/src/invoice_deser.rs
 ./fuzz/src/invoice_request_deser.rs
 ./fuzz/src/lib.rs