From 8191c36a5e34bdc946929b5b7b4cc103df632312 Mon Sep 17 00:00:00 2001
From: Evan Lloyd New-Schmidt <evan@new-schmidt.com>
Date: Tue, 26 Sep 2023 11:03:13 -0400
Subject: [PATCH] Format let-else

Prior to rust 1.72.0, rustfmt ignored let-else statements:
https://blog.rust-lang.org/2023/07/01/rustfmt-supports-let-else-statements.html

Signed-off-by: Evan Lloyd New-Schmidt <evan@new-schmidt.com>
---
 src/get_tags.rs |  4 +++-
 src/html.rs     | 14 ++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/get_tags.rs b/src/get_tags.rs
index 5bf1087..571ae84 100644
--- a/src/get_tags.rs
+++ b/src/get_tags.rs
@@ -26,7 +26,9 @@ pub fn run(pbf: impl Read + Send) -> anyhow::Result<()> {
         .par_bridge()
         .try_for_each(move |blob| -> anyhow::Result<()> {
             // Based on `osmpbf` implementation of `ElementReader`.
-            let BlobDecode::OsmData(block) = blob?.decode()? else { return Ok(()) };
+            let BlobDecode::OsmData(block) = blob?.decode()? else {
+                return Ok(());
+            };
             for record in block.elements().filter_map(extract_tags) {
                 send.send(record)?;
             }
diff --git a/src/html.rs b/src/html.rs
index 220d8b3..f8a219f 100644
--- a/src/html.rs
+++ b/src/html.rs
@@ -117,7 +117,9 @@ fn remove_sections(document: &mut Html, titles: &BTreeSet<&str>) {
     let mut to_remove = Vec::new();
 
     for header in document.select(&HEADERS) {
-        let Some(parent) = header.parent() else { continue; };
+        let Some(parent) = header.parent() else {
+            continue;
+        };
 
         if !parent
             .value()
@@ -131,7 +133,7 @@ fn remove_sections(document: &mut Html, titles: &BTreeSet<&str>) {
 
         // TODO: Should this join all text nodes?
         let Some(title) = header.text().next() else {
-            continue
+            continue;
         };
 
         if !titles.contains(title) {
@@ -219,7 +221,9 @@ fn remove_empty(document: &mut Html) {
 fn remove_empty_sections(document: &mut Html) {
     let mut to_remove = Vec::new();
     for el in document.select(&HEADERS) {
-        let Some(parent) = el.parent() else { continue; };
+        let Some(parent) = el.parent() else {
+            continue;
+        };
 
         if !parent
             .value()
@@ -307,7 +311,9 @@ fn is_empty_or_whitespace(el: &ElementRef) -> bool {
 
 /// Remove an element, leaving any children in its place.
 fn expand_id(document: &mut Html, id: NodeId) {
-    let Some(mut node) = document.tree.get_mut(id) else { return };
+    let Some(mut node) = document.tree.get_mut(id) else {
+        return;
+    };
     if node.parent().is_none() {
         // Already detached.
         return;