From 8c196fa932261b3d291a6f6dc955846c8f116d0c Mon Sep 17 00:00:00 2001
From: Ziyang Hu <hu.ziyang@cantab.net>
Date: Sat, 16 Apr 2022 13:12:37 +0800
Subject: [PATCH] make clippy happy

---
 cozo-rocks/src/lib.rs | 6 +++---
 src/definition.rs     | 8 ++++----
 src/eval.rs           | 8 ++++----
 src/storage.rs        | 2 +-
 src/typing.rs         | 2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cozo-rocks/src/lib.rs b/cozo-rocks/src/lib.rs
index a1facdbd..1f14018e 100644
--- a/cozo-rocks/src/lib.rs
+++ b/cozo-rocks/src/lib.rs
@@ -260,7 +260,7 @@ impl AsRef<[u8]> for Slice {
 }
 
 
-pub type Iterator = UniquePtr<IteratorBridge>;
+pub type DBIterator = UniquePtr<IteratorBridge>;
 
 pub trait IteratorImpl {
     fn seek(&self, key: impl AsRef<[u8]>);
@@ -321,7 +321,7 @@ pub struct DB {
 pub trait DBImpl {
     fn open(options: Options, path: &Path) -> Result<DB>;
     fn get_cf_handle(&self, name: impl AsRef<str>) -> Result<ColumnFamilyHandle>;
-    fn iterator(&self, cf: &ColumnFamilyHandle, options: Option<&ReadOptions>) -> Iterator;
+    fn iterator(&self, cf: &ColumnFamilyHandle, options: Option<&ReadOptions>) -> DBIterator;
     fn create_column_family(&self, name: impl AsRef<str>) -> Result<()>;
     fn drop_column_family(&self, name: impl AsRef<str>) -> Result<()>;
     fn get_column_family_names(&self) -> Vec<String>;
@@ -372,7 +372,7 @@ impl DBImpl for DB {
     }
 
     #[inline]
-    fn iterator(&self, cf: &ColumnFamilyHandle, options: Option<&ReadOptions>) -> Iterator {
+    fn iterator(&self, cf: &ColumnFamilyHandle, options: Option<&ReadOptions>) -> DBIterator {
         self.inner.iterator_raw(options.unwrap_or(&self.default_read_options), cf)
     }
 
diff --git a/src/definition.rs b/src/definition.rs
index 91748dfa..527011d0 100644
--- a/src/definition.rs
+++ b/src/definition.rs
@@ -5,7 +5,7 @@ use crate::env::{Env, LayeredEnv, StructuredEnvItem};
 use crate::error::Result;
 use crate::error::CozoError::*;
 use crate::eval::Evaluator;
-use crate::storage::{RocksStorage, Storage};
+use crate::storage::{RocksStorage};
 use crate::typing::{Col, Columns, Edge, Index, Node, StorageStatus, Structured, TableId, Typing};
 use crate::typing::StorageStatus::{Planned, Stored};
 use crate::value::{ByteArrayBuilder, ByteArrayParser, Value};
@@ -88,11 +88,11 @@ impl StructuredEnvItem {
             }
 
             if let Some(Structured::Node(dst)) = self.resolve_mut(&dst_name) {
-                dst.in_e.push(table_id.clone());
+                dst.in_e.push(table_id);
             } else {
                 unreachable!()
             }
-            Ok(name.to_string())
+            Ok(name)
         } else {
             Err(NameConflict)
         }
@@ -112,7 +112,7 @@ impl StructuredEnvItem {
             attached: vec![],
         };
         if self.define_new(name.clone(), Structured::Node(node)) {
-            Ok(name.to_string())
+            Ok(name)
         } else {
             Err(NameConflict)
         }
diff --git a/src/eval.rs b/src/eval.rs
index 228a6eb5..78c0a14e 100644
--- a/src/eval.rs
+++ b/src/eval.rs
@@ -22,8 +22,8 @@ impl EvaluatorWithStorage {
     }
 }
 
-impl BareEvaluator {
-    pub fn new() -> Self {
+impl Default for BareEvaluator {
+    fn default() -> Self {
         Self { s_envs: StructuredEnv::new(), storage: DummyStorage }
     }
 }
@@ -505,7 +505,7 @@ mod tests {
 
     #[test]
     fn operators() {
-        let mut ev = BareEvaluator::new();
+        let mut ev = BareEvaluator::default();
 
         println!("{:#?}", ev.visit_expr(&parse_expr_from_str("1/10+(-2+3)*4^5").unwrap()).unwrap());
         println!("{:#?}", ev.visit_expr(&parse_expr_from_str("true && false").unwrap()).unwrap());
@@ -847,7 +847,7 @@ mod tests {
 {"_src":205,"_dst":11,"_type":"InDepartment"},
 {"_src":206,"_dst":11,"_type":"InDepartment"}]"#;
         let parsed = parse_expr_from_str(data)?;
-        let mut ev = BareEvaluator::new();
+        let mut ev = BareEvaluator::default();
         let evaluated = ev.visit_expr(&parsed)?;
         println!("{:#?}", evaluated);
         Ok(())
diff --git a/src/storage.rs b/src/storage.rs
index ca1a11a0..f54b3a51 100644
--- a/src/storage.rs
+++ b/src/storage.rs
@@ -1,6 +1,6 @@
 use crate::error::{CozoError, Result};
 use cozo_rocks::*;
-use crate::value::{ByteArrayBuilder, cozo_comparator_v1, Value};
+use crate::value::{cozo_comparator_v1};
 
 
 pub struct RocksStorage {
diff --git a/src/typing.rs b/src/typing.rs
index 41ae51e8..e8ab2b68 100644
--- a/src/typing.rs
+++ b/src/typing.rs
@@ -64,7 +64,7 @@ pub struct TableId{
 impl Debug for TableId {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         f.write_str( if self.global { "+" } else {"-"})?;
-        f.write_str(&format!("{}", self.name))?;
+        f.write_str(&self.name)?;
         Ok(())
     }
 }