From 75bcf73cd63d6a6219a231708f9150fc62590001 Mon Sep 17 00:00:00 2001
From: kyoto7250 <50972773+kyoto7250@users.noreply.github.com>
Date: Mon, 11 Apr 2022 12:36:12 +0900
Subject: [PATCH] remove needless return

---
 src/components/table.rs | 11 ++++++-----
 src/database/mod.rs     |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/table.rs b/src/components/table.rs
index 7efc5be..09b5595 100644
--- a/src/components/table.rs
+++ b/src/components/table.rs
@@ -61,9 +61,9 @@ impl OrderManager {
 
         if !order_query.is_empty() {
             return Some("ORDER BY ".to_string() + &order_query.join(", "));
-        } else {
-            return None;
         }
+
+        None
     }
 
     fn generate_header_icons(&mut self, header_length: usize) -> Vec<String> {
@@ -74,7 +74,8 @@ impl OrderManager {
             header_icons[order.column_number - 1] =
                 format!("{arrow}{number}", arrow = arrow, number = index + 1);
         }
-        return header_icons;
+
+        header_icons
     }
 
     fn add_order(&mut self, selected_column: usize) {
@@ -181,11 +182,11 @@ impl TableComponent {
     }
 
     pub fn generate_order_query(&mut self) -> Option<String> {
-        return self.orders.generate_order_query();
+        self.orders.generate_order_query()
     }
 
     pub fn generate_header_icons(&mut self) -> Vec<String> {
-        return self.orders.generate_header_icons(self.headers.len());
+        self.orders.generate_header_icons(self.headers.len())
     }
 
     pub fn end(&mut self) {
diff --git a/src/database/mod.rs b/src/database/mod.rs
index 7cad19f..059fb3b 100644
--- a/src/database/mod.rs
+++ b/src/database/mod.rs
@@ -57,9 +57,9 @@ fn concat_headers(headers: Vec<String>, header_icons: Option<Vec<String>>) -> Ve
                 .to_string();
         }
         return new_headers;
-    } else {
-        return headers;
     }
+
+    headers
 }
 
 pub enum ExecuteResult {