General cleanup, cargo-clippy fixes

diff --git a/src/merger.rs b/src/merger.rs
index 13af043ea0ca47ad2b7081bff24fea64a3a050a5..2ec071a94c0b3b1129c013cf8c09f881293638af 100644 (file)
--- a/src/merger.rs
+++ b/src/merger.rs
@@ -176,7 +176,7 @@ impl<'a, S: Source<'a> + Ranges<'a>> Ranges<'a> for Merger<'a, S> {
 mod test {
     use super::Merger;
     use crate::source::test::TestSource;
-    use crate::{Entry, Iter, Source};
+    use crate::{Entry, Source};
 
     fn tnum(m: u8) -> Vec<u8> {
         Vec::from_iter((1u8..255).into_iter().filter(|i| i % m == 0))

diff --git a/src/reader/block.rs b/src/reader/block.rs
index 83e639fe88cd5f2fe126a518cd951b54a2b5a82d..e18693615f5cb7537d2864e31c6b6e35cfb02f1a 100644 (file)
--- a/src/reader/block.rs
+++ b/src/reader/block.rs
@@ -52,7 +52,6 @@ impl<'b> Block<'b> {
         }
         dlen -= 4;
 
-        let restarts: Restarts;
         let nrestarts = u32::from_be_bytes(data[dlen..].try_into()?) as usize;
 
         // try 32-bit restarts
@@ -62,8 +61,8 @@ impl<'b> Block<'b> {
         }
         let mut dlen = dlen - len_restarts;
 
-        if dlen <= u32::max_value() as usize {
-            restarts = Restarts::Restart32(&data[dlen..data.len() - 4]);
+        let restarts = if dlen <= u32::MAX as usize {
+            Restarts::Restart32(&data[dlen..data.len() - 4])
         } else {
             // try 64-bit restarts
             dlen -= len_restarts;
@@ -71,8 +70,8 @@ impl<'b> Block<'b> {
             if len_restarts > dlen {
                 return Err("block data too short 3".into());
             }
-            restarts = Restarts::Restart64(&data[dlen..data.len() - 4]);
-        }
+            Restarts::Restart64(&data[dlen..data.len() - 4])
+        };
         Ok(Block {
             data: &data[..dlen - 4], // XXX - debugme -- off by 4
             restarts,
@@ -81,7 +80,7 @@ impl<'b> Block<'b> {
 
     pub(crate) fn iter(&self) -> BlockIter<'_> {
         BlockIter {
-            block: &self,
+            block: self,
             cur_key: Arc::new(Vec::new()),
             cur_val: Arc::new(Vec::new()),
             off: 0,

diff --git a/src/writer/block_builder.rs b/src/writer/block_builder.rs
index 5ad380bd5c87392eb499177eee91926a17b36774..05574c12395e0dd8925aad4665be70c63d718e2a 100644 (file)
--- a/src/writer/block_builder.rs
+++ b/src/writer/block_builder.rs
@@ -63,7 +63,7 @@ impl BlockBuilder {
     }
 
     fn restart_size(&self) -> usize {
-        if self.data.len() > u32::max_value() as usize {
+        if self.data.len() > u32::MAX as usize {
             4
         } else {
             8
@@ -84,7 +84,7 @@ impl BlockBuilder {
         }
 
         let num_restarts = self.restarts.len();
-        assert!(num_restarts <= u32::max_value() as usize);
+        assert!(num_restarts <= u32::MAX as usize);
         self.data.reserve(num_restarts * self.restart_size() + 4);
         match self.restart_size() {
             4 => {