chore: lint and format source code

Author: zouguangxian

bench/src/speed/test_gen.rs

@@ -110,8 +110,7 @@ impl TestGenV2 {
             self.cur_read_num = 0;
         }
         //println!("AA gen_block cur_round={} block_count={} sp={:?}", self.cur_round, self.block_count, self.sp);
-        let mut res: Vec<RwLock<Option<SimpleTask>>> =
-            Vec::with_capacity(self.task_in_block);
+        let mut res: Vec<RwLock<Option<SimpleTask>>> = Vec::with_capacity(self.task_in_block);
         for _ in 0..self.task_in_block {
             res.push(RwLock::new(None));
         }

qmdb/examples/v2_demo.rs

@@ -1,8 +1,6 @@
 use parking_lot::RwLock;
 use qmdb::config::Config;
-use qmdb::def::{
-    DEFAULT_ENTRY_SIZE, IN_BLOCK_IDX_BITS, OP_CREATE,
-};
+use qmdb::def::{DEFAULT_ENTRY_SIZE, IN_BLOCK_IDX_BITS, OP_CREATE};
 use qmdb::entryfile::EntryBz;
 use qmdb::tasks::TasksManager;
 use qmdb::test_helper::SimpleTask;
@@ -58,10 +56,7 @@ fn main() {
     //task id's high 40 bits is block height and low 24 bits is task index
     let last_task_id = (height << IN_BLOCK_IDX_BITS) | (task_count - 1);
     //add the tasks into QMDB
-    ads.start_block(
-        height,
-        Arc::new(TasksManager::new(task_list, last_task_id)),
-    );
+    ads.start_block(height, Arc::new(TasksManager::new(task_list, last_task_id)));
     //multiple shared_ads can be shared by different threads
     let shared_ads = ads.get_shared();
     //you can associate some extra data in json format to each block
@@ -86,6 +81,6 @@ fn main() {
     // now we use another shared_ads to read entry out
     let shared_ads = ads.get_shared();
     let (n, ok) = shared_ads.read_entry(-1, &kh[..], &[], &mut buf);
-    let e = EntryBz{ bz: &buf[..n] };
+    let e = EntryBz { bz: &buf[..n] };
     println!("entry={:?} value={:?} ok={}", &buf[..n], e.value(), ok);
 }

qmdb/src/entryfile/entry.rs

@@ -183,7 +183,7 @@ impl<'a> EntryBz<'a> {
             res[1] = self.bz[6]; // second byte of key
             return res;
         }
-        return hasher::hash(self.key());
+        hasher::hash(self.key())
     }
 
     fn next_key_hash_start(&self) -> usize {
@@ -272,7 +272,7 @@ impl EntryVec {
 
         let mut buf_list: Vec<Box<[u8]>> = Vec::with_capacity(0);
         let total_len = bz.len();
-        for _ in 0..(next_pos + BIG_BUF_SIZE - 1) / BIG_BUF_SIZE {
+        for _ in 0..next_pos.div_ceil(BIG_BUF_SIZE) {
             let mut buf = new_big_buf_boxed();
             let size = std::cmp::min(total_len - off, BIG_BUF_SIZE);
             buf[0..size].copy_from_slice(&bz[off..off + size]);

qmdb/src/indexer/hybrid/file_reader.rs

@@ -133,7 +133,9 @@ pub fn decrypt_page(page: &mut [u8], off_in_file: usize, cipher: &Option<Aes256G
     tag[..].copy_from_slice(&page[tag_start..]);
 
     let enc = &mut page[..tag_start];
-    if let Err(e) = cipher.decrypt_in_place_detached(&nonce_arr.into(), b"", enc, &tag.into()) { panic!("{:?}", e) };
+    if let Err(e) = cipher.decrypt_in_place_detached(&nonce_arr.into(), b"", enc, &tag.into()) {
+        panic!("{:?}", e)
+    };
 }
 
 #[cfg(test)]

qmdb/src/indexer/hybrid/tempfile.rs

@@ -46,7 +46,7 @@ impl TempFile {
 
 impl Drop for TempFile {
     fn drop(&mut self) {
-        if let Err(_) = remove_file(self.fname.clone()) {
+        if remove_file(self.fname.clone()).is_err() {
             panic!("Fail to remove file: {}", self.fname);
         }
     }

qmdb/src/indexer/inmem.rs

@@ -114,7 +114,7 @@ struct RoLeaf<'a> {
     data: &'a [u8],
 }
 
-impl<'a> RoLeaf<'a> {
+impl RoLeaf<'_> {
     fn is_full(&self) -> bool {
         2 + self.len() * KV_SIZE == self.data.len()
     }
@@ -174,7 +174,7 @@ impl<'a> RoLeaf<'a> {
     }
 }
 
-impl<'a> Leaf<'a> {
+impl Leaf<'_> {
     fn to_readonly(&self) -> RoLeaf {
         RoLeaf { data: &*self.data }
     }

qmdb/src/merkletree/tree.rs

@@ -934,10 +934,10 @@ impl Tree {
                 .get_twig_root(twig_id)
                 .unwrap_or(&twig::NULL_TWIG.twig_root);
         }
-        return *self
+        *self
             .upper_tree
             .get_node(NodePos::pos(level as u64, nth))
-            .unwrap_or(&NULL_NODE_IN_HIGHER_TREE[level as usize]);
+            .unwrap_or(&NULL_NODE_IN_HIGHER_TREE[level as usize])
     }
 }
 

qmdb/src/seqads/entry_updater.rs

@@ -348,7 +348,7 @@ impl EntryUpdater {
     }
 
     pub fn get_all_entry_bz(&self) -> Vec<EntryBz> {
-        return self.update_buffer.get_all_entry_bz();
+        self.update_buffer.get_all_entry_bz()
     }
 
     pub fn read_entry(&mut self, shard_id: usize, file_pos: i64) {

qmdb/src/seqads/mod.rs

@@ -153,7 +153,7 @@ impl SeqAds {
                 indexer.clone(),
             )));
         }
-        
+
         Self {
             height: AtomicI64::from(curr_height),
             indexer,

qmdb/src/seqads/proof.rs

@@ -374,7 +374,9 @@ impl<T: Task + 'static> SeqAdsWrap<T> {
             let prev_entry = EntryBz { bz: &buf[..size] };
             if self_pos >= 0 && prev_entry.next_key_hash() == key_hash {
                 found = true;
-            } else if prev_entry.key_hash() < *key_hash && &key_hash[..] < prev_entry.next_key_hash() {
+            } else if prev_entry.key_hash() < *key_hash
+                && &key_hash[..] < prev_entry.next_key_hash()
+            {
                 found = true;
             }
             if found {
@@ -436,7 +438,7 @@ impl<T: Task + 'static> SeqAdsWrap<T> {
         if buf.len() < size {
             return (size, true); //stop loop if buf is too small
         }
-        (size, buf_too_small)// stop loop if key matches
+        (size, buf_too_small) // stop loop if key matches
     }
 }