From e027f8f713c8f98f63f129803099f9d36390a318 Mon Sep 17 00:00:00 2001
From: Hatter Jiang <jht5945@gmail.com>
Date: Sat, 19 Sep 2020 20:12:40 +0800
Subject: [PATCH] refactor: fix clippy

---
 src/util_file.rs | 6 +-----
 src/util_msg.rs  | 4 +++-
 src/util_net.rs  | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/util_file.rs b/src/util_file.rs
index 76bc7f2..5a34fd3 100644
--- a/src/util_file.rs
+++ b/src/util_file.rs
@@ -26,11 +26,7 @@ impl JoinFilesReader {
         if !files.is_empty() {
             file_lines = Some(Box::new(open_file_as_lines(&files[0])?));
         }
-        Ok(Self {
-            files,
-            file_ptr,
-            file_lines,
-        })
+        Ok(Self { files, file_ptr, file_lines })
     }
 }
 
diff --git a/src/util_msg.rs b/src/util_msg.rs
index dc84aca..d6ccb2a 100644
--- a/src/util_msg.rs
+++ b/src/util_msg.rs
@@ -22,7 +22,9 @@ impl MessageType {
 }
 
 pub fn get_logger_level() -> MessageType {
-    if let Some(logger_level) = env::var("LOGGER_LEVEL").ok().or(env::var("LOGGER").ok()).or(env::var("LEVEL").ok()) {
+    if let Some(logger_level) = env::var("LOGGER_LEVEL").ok()
+                                                        .or_else(|| env::var("LOGGER").ok())
+                                                        .or_else(|| env::var("LEVEL").ok()) {
         match logger_level.trim().to_lowercase().as_str() {
             "debug" | "*" => MessageType::DEBUG,
             "info"  | "?" => MessageType::INFO,
diff --git a/src/util_net.rs b/src/util_net.rs
index 0de86fc..6a52159 100644
--- a/src/util_net.rs
+++ b/src/util_net.rs
@@ -12,7 +12,7 @@ pub enum IpAddress {
 
 impl IpAddress {
     pub fn parse_ipv4(addr: &str) -> Option<Self> {
-        parse_ipv4_addr(addr).map(|parts| IpAddress::Ipv4(parts))
+        parse_ipv4_addr(addr).map(IpAddress::Ipv4)
     }
 
     pub fn to_address(&self) -> String {
@@ -23,7 +23,7 @@ impl IpAddress {
 
     pub fn is_matches(&self, socket_addr: &SocketAddr) -> bool {
         match self {
-            IpAddress::Ipv4(self_ipv4_octets) => IpAddressMask::Ipv4(self_ipv4_octets.clone(), 32).is_matches(socket_addr),
+            IpAddress::Ipv4(self_ipv4_octets) => IpAddressMask::Ipv4(*self_ipv4_octets, 32).is_matches(socket_addr),
         }
     }
 }