Fix errors from the newer clippy

CodeChain-io · Aug 12, 2020 · 01344a7 · 01344a7
1 parent 7f78272
commit 01344a7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/journaldb/archivedb.rs b/src/journaldb/archivedb.rs
@@ -199,7 +199,6 @@ mod tests {
     use super::*;
     use crate::JournalDB;
     use codechain_crypto::blake256;
-    use kvdb_memorydb;
 
     #[test]
     fn insert_same_in_fork() {

diff --git a/src/memorydb.rs b/src/memorydb.rs
@@ -104,7 +104,7 @@ impl MemoryDB {
 
     /// Return the internal map of hashes to data, clearing the current state.
     pub fn drain(&mut self) -> H256FastMap<(DBValue, i32)> {
-        mem::replace(&mut self.data, H256FastMap::default())
+        mem::take(&mut self.data)
     }
 
     /// Grab the raw information associated with a key. Returns None if the key
@@ -186,10 +186,7 @@ impl HashDB for MemoryDB {
             return true
         }
 
-        match self.data.get(key) {
-            Some(&(_, x)) if x > 0 => true,
-            _ => false,
-        }
+        matches!(self.data.get(key), Some(&(_, x)) if x > 0)
     }
 
     fn insert(&mut self, value: &[u8]) -> H256 {