From fa03b8371024df0982ddd82b4028442d553c7cf0 Mon Sep 17 00:00:00 2001
From: Takayuki Maeda <takoyaki0316@gmail.com>
Date: Sun, 11 Jul 2021 00:56:15 +0900
Subject: [PATCH] fix clippy warnings

---
 database-tree/src/databasetreeitems.rs |  4 ++--
 database-tree/src/item.rs              |  2 +-
 src/components/databases.rs            | 25 +++++++++----------------
 src/components/error.rs                |  2 +-
 src/handlers/connection_list.rs        |  2 +-
 src/handlers/database_list.rs          |  1 -
 6 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/database-tree/src/databasetreeitems.rs b/database-tree/src/databasetreeitems.rs
index 1ff5fc6..d0fedb9 100644
--- a/database-tree/src/databasetreeitems.rs
+++ b/database-tree/src/databasetreeitems.rs
@@ -29,11 +29,11 @@ impl DatabaseTreeItems {
                     if item.is_database() {
                         let mut item = item.clone();
                         item.set_collapsed(false);
-                        item.clone()
+                        item
                     } else {
                         let mut item = item.clone();
                         item.show();
-                        item.clone()
+                        item
                     }
                 })
                 .collect::<Vec<DatabaseTreeItem>>(),
diff --git a/database-tree/src/item.rs b/database-tree/src/item.rs
index 0b5e1a8..a3cc268 100644
--- a/database-tree/src/item.rs
+++ b/database-tree/src/item.rs
@@ -145,7 +145,7 @@ impl DatabaseTreeItem {
         self.info.visible = false;
     }
 
-    pub fn is_match(&self, filter_text: &String) -> bool {
+    pub fn is_match(&self, filter_text: &str) -> bool {
         match self.kind.clone() {
             DatabaseTreeItemKind::Database { name, .. } => name.contains(filter_text),
             DatabaseTreeItemKind::Table { table, .. } => table.name.contains(filter_text),
diff --git a/src/components/databases.rs b/src/components/databases.rs
index 2ed1dfe..98c7393 100644
--- a/src/components/databases.rs
+++ b/src/components/databases.rs
@@ -143,13 +143,10 @@ impl DatabasesComponent {
         items.insert(
             0,
             Span::styled(
-                format!(
-                    "{}",
-                    (0..area.width as usize)
-                        .map(|_| HORIZONTAL)
-                        .collect::<Vec<&str>>()
-                        .join("")
-                ),
+                (0..area.width as usize)
+                    .map(|_| HORIZONTAL)
+                    .collect::<Vec<&str>>()
+                    .join(""),
                 Style::default(),
             ),
         );
@@ -200,14 +197,12 @@ impl DatabasesComponent {
 
 impl DrawableComponent for DatabasesComponent {
     fn draw<B: Backend>(&mut self, f: &mut Frame<B>, area: Rect, focused: bool) -> Result<()> {
-        if true {
-            let chunks = Layout::default()
-                .direction(Direction::Horizontal)
-                .constraints([Constraint::Percentage(100)].as_ref())
-                .split(area);
+        let chunks = Layout::default()
+            .direction(Direction::Horizontal)
+            .constraints([Constraint::Percentage(100)].as_ref())
+            .split(area);
 
-            self.draw_tree(f, chunks[0], focused);
-        }
+        self.draw_tree(f, chunks[0], focused);
         Ok(())
     }
 }
@@ -262,7 +257,5 @@ impl Component for DatabasesComponent {
 fn tree_nav(tree: &mut DatabaseTree, key: Key) {
     if let Some(common_nav) = common_nav(key) {
         tree.move_selection(common_nav);
-    } else {
-        false;
     }
 }
diff --git a/src/components/error.rs b/src/components/error.rs
index d83af84..0230849 100644
--- a/src/components/error.rs
+++ b/src/components/error.rs
@@ -49,7 +49,7 @@ impl DrawableComponent for ErrorComponent {
 }
 
 impl Component for ErrorComponent {
-    fn event(&mut self, key: Key) -> Result<()> {
+    fn event(&mut self, _key: Key) -> Result<()> {
         Ok(())
     }
 }
diff --git a/src/handlers/connection_list.rs b/src/handlers/connection_list.rs
index ce18e00..ba4dd1a 100644
--- a/src/handlers/connection_list.rs
+++ b/src/handlers/connection_list.rs
@@ -2,7 +2,7 @@ use crate::app::{App, FocusBlock};
 use crate::components::Component as _;
 use crate::event::Key;
 use crate::utils::{get_databases, get_tables};
-use database_tree::{Database, DatabaseTree};
+use database_tree::Database;
 use sqlx::mysql::MySqlPool;
 use std::collections::BTreeSet;
 
diff --git a/src/handlers/database_list.rs b/src/handlers/database_list.rs
index 72fe08e..88ca64c 100644
--- a/src/handlers/database_list.rs
+++ b/src/handlers/database_list.rs
@@ -1,5 +1,4 @@
 use crate::app::{App, FocusBlock};
-use crate::components::databases::FocusBlock as DatabaseFocusBlock;
 use crate::components::Component as _;
 use crate::event::Key;
 use crate::utils::{get_columns, get_records};