From 71ae5e2eb2d9f832cd0e42e32d4d9c88c6efdf7b Mon Sep 17 00:00:00 2001
From: "Hatter Jiang@Pixelbook" <jht5945@gmail.com>
Date: Sat, 1 Aug 2020 16:34:48 +0800
Subject: [PATCH] style: fix clippy

---
 src/main.rs   | 11 ++++++++---
 src/script.rs | 11 +++++------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 2e28711..36dd9de 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -23,17 +23,22 @@ use cmd_new::CommandNew;
     ($($arg:tt)+) => ( crate::print_wa(&format!($($arg)+)); )
 }
 
+const GREEN: &str = "\x1B[92m";
+const YELLOW: &str = "\x1B[93m";
+const BOLD: &str = "\x1B[1m";
+const END: &str = "\x1B[0m";
+
 #[inline]
 fn print_in (msg: &str) {
-    println!("{b}[INFO]{e} {m}", b = "\x1B[1m", e = "\x1B[0m", m = msg);
+    println!("{b}[INFO]{e} {m}", b = BOLD, e = END, m = msg);
 }
 #[inline]
 fn print_ok (msg: &str) {
-    println!("{g}{b}[ OK ]{e} {g}{m}{e}", g = "\x1B[92m", b = "\x1B[1m", e = "\x1B[0m", m = msg);
+    println!("{g}{b}[ OK ]{e} {g}{m}{e}", g = GREEN, b = BOLD, e = END, m = msg);
 }
 #[inline]
 fn print_wa (msg: &str) {
-    println!("{g}{b}[WARN]{e} {g}{m}{e}", g = "\x1B[93m", b = "\x1B[1m", e = "\x1B[0m", m = msg);
+    println!("{g}{b}[WARN]{e} {g}{m}{e}", g = YELLOW, b = BOLD, e = END, m = msg);
 }
 
 fn main() -> CommandError {
diff --git a/src/script.rs b/src/script.rs
index 755d462..fd8b25a 100644
--- a/src/script.rs
+++ b/src/script.rs
@@ -25,11 +25,10 @@ pub struct ScriptLocalConfig {
 
 pub fn _get_script_base_path(base: &PathBuf, file_name: &str) -> PathBuf {
     let mut fn_chars = file_name.chars().take_while(|c| *c != '.');
-    let path = base.join(fn_chars.next().unwrap_or('_').to_string())
-                   .join(fn_chars.next().unwrap_or('_').to_string())
-                   .join(fn_chars.next().unwrap_or('_').to_string())
-                   .join(file_name);
-    path
+    base.join(fn_chars.next().unwrap_or('_').to_string())
+        .join(fn_chars.next().unwrap_or('_').to_string())
+        .join(fn_chars.next().unwrap_or('_').to_string())
+        .join(file_name)
 }
 
 pub fn _list_versions(script_base_path: &PathBuf) -> Vec<(PathBuf, String)> {
@@ -43,7 +42,7 @@ pub fn _list_versions(script_base_path: &PathBuf) -> Vec<(PathBuf, String)> {
                     trace!("Found dir: {:?}", path);
                     match path.file_name().to_str() {
                         None => error!("Get path file name: {:?}, is none", path),
-                        Some(file_name) => if file_name.starts_with("v") {
+                        Some(file_name) => if file_name.starts_with('v') {
                             let ver = get_dir_ver(&file_name);
                             ret.push((path.path(), ver));
                         },