From 3cdafa7be965117bbb48a85c1632b60fc0f89754 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 27 Jan 2023 23:01:01 +0100 Subject: [PATCH] Fix clippy warnings --- src/bin/nbtdump.rs | 2 +- src/bin/regiondump.rs | 8 +++++--- src/io/region.rs | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/bin/nbtdump.rs b/src/bin/nbtdump.rs index b2f287e..d944cf2 100644 --- a/src/bin/nbtdump.rs +++ b/src/bin/nbtdump.rs @@ -12,7 +12,7 @@ struct Args { fn main() -> Result<()> { let args = Args::parse(); - let value: fastnbt::Value = minedmap::io::data::from_file(&args.file)?; + let value: fastnbt::Value = minedmap::io::data::from_file(args.file.as_path())?; println!("{:#x?}", value); Ok(()) diff --git a/src/bin/regiondump.rs b/src/bin/regiondump.rs index 3b68881..5663a80 100644 --- a/src/bin/regiondump.rs +++ b/src/bin/regiondump.rs @@ -12,7 +12,9 @@ struct Args { fn main() -> Result<()> { let args = Args::parse(); - minedmap::io::region::from_file(&args.file)?.foreach_chunk(|coords, value: fastnbt::Value| { - println!("Chunk {:?}: {:#x?}", coords, value); - }) + minedmap::io::region::from_file(args.file.as_path())?.foreach_chunk( + |coords, value: fastnbt::Value| { + println!("Chunk {:?}: {:#x?}", coords, value); + }, + ) } diff --git a/src/io/region.rs b/src/io/region.rs index 332f2cd..df5578a 100644 --- a/src/io/region.rs +++ b/src/io/region.rs @@ -51,11 +51,11 @@ where let buf = &buf[..len]; let (format, buf) = buf.split_at(1); - if format.get(0) != Some(&2) { + if !matches!(format, [2]) { bail!("Unknown chunk format"); } - let mut decoder = ZlibDecoder::new(&buf[..]); + let mut decoder = ZlibDecoder::new(buf); let mut decode_buffer = vec![]; decoder .read_to_end(&mut decode_buffer)