From a2ba7e4738d14339696f092a25f9bb8f556188c9 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 1 Mar 2023 19:17:50 +0100 Subject: [PATCH] main: build processed_dir path outside of RegionProcessor::new() --- src/main.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main.rs b/src/main.rs index 23f6609..841c177 100644 --- a/src/main.rs +++ b/src/main.rs @@ -19,16 +19,16 @@ struct Args { type RegionCoords = (i32, i32); /// Type with methods for processing the regions of a Minecraft save directory -struct RegionProcessor { +struct RegionProcessor<'a> { block_types: resource::BlockTypeMap, - processed_dir: PathBuf, + processed_dir: &'a Path, } -impl RegionProcessor { - fn new(output_dir: &Path) -> Self { +impl<'a> RegionProcessor<'a> { + fn new(processed_dir: &'a Path) -> Self { RegionProcessor { block_types: resource::block_types(), - processed_dir: [output_dir, Path::new("processed")].iter().collect(), + processed_dir, } } @@ -148,8 +148,9 @@ fn main() -> Result<()> { let args = Args::parse(); let region_dir: PathBuf = [&args.input_dir, Path::new("region")].iter().collect(); + let processed_dir: PathBuf = [&args.output_dir, Path::new("processed")].iter().collect(); - let region_processor = RegionProcessor::new(&args.output_dir); + let region_processor = RegionProcessor::new(&processed_dir); region_processor.process_region_dir(®ion_dir)?; Ok(())