From 18cecb947e95cb2279b238db188a48e907d0b31e Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 1 Mar 2023 00:09:11 +0100 Subject: [PATCH] main: factor out process_chunk() method --- src/main.rs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main.rs b/src/main.rs index 10e9445..9d08dba 100644 --- a/src/main.rs +++ b/src/main.rs @@ -43,20 +43,22 @@ impl RegionProcessor { Some((x.parse().ok()?, z.parse().ok()?)) } + /// Processes a single chunk + fn process_chunk(&self, data: world::de::Chunk) -> Result> { + let chunk = world::chunk::Chunk::new(&data)?; + world::layer::top_layer(&chunk, &self.block_types) + } + /// Processes a single region file fn process_region(&self, path: &Path, coords: RegionCoords) -> Result<()> { println!("Processing region r.{}.{}.mca", coords.0, coords.1); minedmap::io::region::from_file(path)?.foreach_chunk( |chunk_coords, data: world::de::Chunk| { - (|| -> Result<()> { - let chunk = world::chunk::Chunk::new(&data)?; - - let _top_layer = world::layer::top_layer(&chunk, &self.block_types)?; - - Ok(()) - })() - .with_context(|| format!("Failed to process chunk {:?}", chunk_coords)) + let _processed_chunk = self + .process_chunk(data) + .with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?; + Ok(()) }, ) }