From 7d231b92ea1ae524907e13ff4320450194bc9ab0 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 5 Aug 2023 10:46:47 +0200 Subject: [PATCH] Format let-else blocks Use nightly rustfmt to format let-else. --- src/bin/minedmap/region_processor.rs | 11 ++++++++--- src/bin/minedmap/tile_renderer.rs | 8 +++++++- src/world/layer.rs | 4 +++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs index 8a77a73..6600844 100644 --- a/src/bin/minedmap/region_processor.rs +++ b/src/bin/minedmap/region_processor.rs @@ -20,8 +20,8 @@ fn parse_region_filename(path: &Path) -> Option { let file_name = path.file_name()?.to_str()?; let parts: Vec<_> = file_name.split('.').collect(); let &["r", x, z, "mca"] = parts.as_slice() else { - return None; - }; + return None; + }; Some(TileCoords { x: x.parse().ok()?, @@ -114,7 +114,12 @@ impl<'a> RegionProcessor<'a> { minedmap::io::region::from_file(path)?.foreach_chunk( |chunk_coords, data: world::de::Chunk| { - let Some(layer::LayerData{ blocks, biomes, block_light, depths }) = self + let Some(layer::LayerData { + blocks, + biomes, + block_light, + depths, + }) = self .process_chunk(&mut processed_region.biome_list, data) .with_context(|| format!("Failed to process chunk {:?}", chunk_coords))? else { diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs index 76485bb..efede58 100644 --- a/src/bin/minedmap/tile_renderer.rs +++ b/src/bin/minedmap/tile_renderer.rs @@ -107,7 +107,13 @@ impl<'a> TileRenderer<'a> { continue; } - let Some(biome) = biome_at(region_group, chunk_coords, block_coords, dx as i32, dz as i32) else { + let Some(biome) = biome_at( + region_group, + chunk_coords, + block_coords, + dx as i32, + dz as i32, + ) else { continue; }; diff --git a/src/world/layer.rs b/src/world/layer.rs index fa9a4f7..3abc30b 100644 --- a/src/world/layer.rs +++ b/src/world/layer.rs @@ -55,7 +55,9 @@ impl<'a> LayerEntry<'a> { section: SectionIterItem, coords: SectionBlockCoords, ) -> Result { - let Some(block_type) = section.section.block_at(coords)? + let Some(block_type) = section + .section + .block_at(coords)? .filter(|block_type| block_type.is(BlockFlag::Opaque)) else { if self.is_empty() {