From b0ce06daf547eee56de908aa72ca0e7a8f8b99b3 Mon Sep 17 00:00:00 2001 From: Chris Mikkelson Date: Wed, 7 Aug 2024 16:48:45 -0600 Subject: [PATCH] cargo-clippy lints --- src/reader/block.rs | 3 +-- src/reader/mod.rs | 3 +-- src/writer/mod.rs | 6 +++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/reader/block.rs b/src/reader/block.rs index 72d5558..2695e27 100644 --- a/src/reader/block.rs +++ b/src/reader/block.rs @@ -191,13 +191,12 @@ impl> Iter for BlockIter { while left < right { let mid = left + (right - left) / 2; self.seek_restart(mid) - .and_then(|()| { + .map(|()| { if self.cur_ent.as_ref().unwrap().key.as_slice() > key { right = mid; } else { left = mid + 1; } - Some(()) }) .or_else(|| { left = right; // breaks loop diff --git a/src/reader/mod.rs b/src/reader/mod.rs index 939ee6b..047afdc 100644 --- a/src/reader/mod.rs +++ b/src/reader/mod.rs @@ -158,9 +158,8 @@ impl> Iter for ReaderIter { self.index_iter.seek(key); self.index_iter.next().and_then(|e| { self.next_offset = usize::decode_var(e.value.as_slice())?.0; - self.next_block().and_then(|_| { + self.next_block().map(|_| { self.data_iter.as_mut().unwrap().seek(key); - Some(()) }) }); } diff --git a/src/writer/mod.rs b/src/writer/mod.rs index 85090cd..751870c 100644 --- a/src/writer/mod.rs +++ b/src/writer/mod.rs @@ -133,7 +133,7 @@ impl Writer { pub fn compression(mut self, comp: Compression) -> Self { self.comp = comp; - self.meta.compression_algorithm = comp.into(); + self.meta.compression_algorithm = comp; self } @@ -154,8 +154,8 @@ impl Writer { let b = self.block.as_slice(); let cb = self.comp.compress(b)?; self.written += self.out.write_varint(cb.len())?; - self.written += self.out.write_fixedint(crc32c(&*cb))?; - self.out.write_all(&*cb)?; + self.written += self.out.write_fixedint(crc32c(&cb))?; + self.out.write_all(&cb)?; self.written += cb.len(); self.block.reset(); Ok(()) -- 2.50.1