cargo-clippy lints

diff --git a/src/reader/block.rs b/src/reader/block.rs
index 72d5558e10fd6f7fd3750bb637871c3cfc953060..2695e2764b02639935382511e13d09172fdfeec9 100644 (file)
--- a/src/reader/block.rs
+++ b/src/reader/block.rs
@@ -191,13 +191,12 @@ impl<D: AsRef<[u8]>> Iter for BlockIter<D> {
         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 939ee6b29b21b3331ff0f8f6fe700b5eca986c26..047afdcf9d6cae6aa0799e1e895ff95079c9410f 100644 (file)
--- a/src/reader/mod.rs
+++ b/src/reader/mod.rs
@@ -158,9 +158,8 @@ impl<D: AsRef<[u8]>> Iter for ReaderIter<D> {
         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 85090cda392f3536caaea3632f2b78ae54507784..751870ca4493364e68ed6cfb138eebc6053a0dcc 100644 (file)
--- a/src/writer/mod.rs
+++ b/src/writer/mod.rs
@@ -133,7 +133,7 @@ impl<W: std::io::Write> Writer<W> {
 
     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<W: std::io::Write> Writer<W> {
         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(())