organicmaps/wikiparser
13
Fork 0
Code Issues 13 Pull requests 2 Projects Releases Wiki Activity Actions

Format let-else

Browse source 
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>
This commit is contained in:
Evan Lloyd New-Schmidt 2023-09-26 11:03:13 -04:00 • committed by Evan Lloyd New-Schmidt
parent d0480e9089
commit 8191c36a5e
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/get_tags.rs
View file

@ -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)?;
}

14
src/html.rs
View file

@ -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;