format code with clippy

clearloop · clearloop · commit 75eb3b778eae · 2020-01-06T21:32:09.000+08:00
diff --git a/src/cache/mod.rs b/src/cache/mod.rs
@@ -75,7 +75,7 @@ impl Cache {
     /// Get problem
     pub fn get_problem(&self, rfid: i32) -> Result<Problem, Error> {
         let p: Problem = problems.filter(fid.eq(rfid)).first(&self.conn()?)?;
-        if p.category != "algorithms".to_string() {
+        if p.category != "algorithms" {
             return Err(Error::FeatureError(
                 "Not support database and shell questions for now".to_string(),
             ));
@@ -98,6 +98,7 @@ impl Cache {
     }
 
     /// Get question
+    #[allow(clippy::useless_let_if_seq)]
     pub fn get_question(&self, rfid: i32) -> Result<Question, Error> {
         let target: Problem = problems.filter(fid.eq(rfid)).first(&self.conn()?)?;
 
@@ -115,7 +116,7 @@ impl Cache {
             "is on the run...".dimmed()
         );
 
-        if target.category != "algorithms".to_string() {
+        if target.category != "algorithms" {
             return Err(Error::FeatureError(
                 "Not support database and shell questions for now".to_string(),
             ));
@@ -128,7 +129,7 @@ impl Cache {
         }
 
         let mut rdesc = Question::default();
-        if target.desc.len() > 0 {
+        if !target.desc.is_empty() {
             rdesc = serde_json::from_str(&target.desc)?;
         } else {
             let json: Value = self.0.clone().get_question_detail(&target.slug)?.json()?;
@@ -193,7 +194,7 @@ impl Cache {
 
         // pass manually data
         json.insert("name", p.name.to_string());
-        json.insert("data_input", d.case.to_string());
+        json.insert("data_input", d.case);
 
         let url = match run {
             Run::Test => conf.sys.urls.get("test")?.replace("$slug", &p.slug),
diff --git a/src/cache/models.rs b/src/cache/models.rs
@@ -29,11 +29,11 @@ pub struct Problem {
     pub desc: String,
 }
 
-static DONE: &'static str = " ✔";
-static ETC: &'static str = "...";
-static LOCK: &'static str = "🔒";
-static NDONE: &'static str = "✘";
-static SPACE: &'static str = " ";
+static DONE: &str = " ✔";
+static ETC: &str = "...";
+static LOCK: &str = "🔒";
+static NDONE: &str = "✘";
+static SPACE: &str = " ";
 impl std::fmt::Display for Problem {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let space_2 = SPACE.repeat(2);
@@ -46,7 +46,7 @@ impl std::fmt::Display for Problem {
         if self.locked {
             lock = LOCK
         };
-        if self.status == "ac".to_string() {
+        if self.status == "ac" {
             done = DONE.green().bold();
         } else if self.status == "notac" {
             done = NDONE.green().bold();
@@ -76,7 +76,7 @@ impl std::fmt::Display for Problem {
             }
         }
 
-        if &self.name.len() < &60_usize {
+        if self.name.len() < 60_usize {
             name.push_str(&self.name);
             name.push_str(&SPACE.repeat(60 - &self.name.len()));
         } else {
@@ -246,24 +246,25 @@ impl std::fmt::Display for VerifyResult {
         debug!("{:#?}", &self);
 
         match &self.status.status_code {
-            10 => match self.correct_answer {
-                // Pass Test
-                true => write!(
-                    f,
-                    "\n  {}{}{}\n{}{}{}{}{}{}\n",
-                    &self.status.status_msg.green().bold(),
-                    "       Runtime: ".dimmed(),
-                    &self.status.status_runtime.dimmed(),
-                    "\n  Your input:    ",
-                    &self.data_input.replace("\n", ", "),
-                    "\n  Output:        ",
-                    ca,
-                    "\n  Expected:      ",
-                    eca,
-                ),
-                false => match &self.submit.compare_result.len() > &0 {
+            10 => {
+                if self.correct_answer {
+                    // Pass Test
+                    write!(
+                        f,
+                        "\n  {}{}{}\n{}{}{}{}{}{}\n",
+                        &self.status.status_msg.green().bold(),
+                        "       Runtime: ".dimmed(),
+                        &self.status.status_runtime.dimmed(),
+                        "\n  Your input:    ",
+                        &self.data_input.replace("\n", ", "),
+                        "\n  Output:        ",
+                        ca,
+                        "\n  Expected:      ",
+                        eca,
+                    )
+                } else if !self.submit.compare_result.is_empty() {
                     // Submit Successfully
-                    true => write!(
+                    write!(
                         f,
                         "\n{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}.\n",
                         "  Success\n\n".green().bold(),
@@ -296,9 +297,10 @@ impl std::fmt::Display for VerifyResult {
                         &self.pretty_lang,
                         " online submissions for ",
                         &self.name,
-                    ),
+                    )
+                } else {
                     // Wrong Answer
-                    false => write!(
+                    write!(
                         f,
                         "\n{}{}{}\n{}{}{}{}{}{}\n",
                         "  Wrong Answer".red().bold(),
@@ -310,9 +312,9 @@ impl std::fmt::Display for VerifyResult {
                         ca,
                         "\n  Expected:      ",
                         eca,
-                    ),
-                },
-            },
+                    )
+                }
+            }
             // Output Timeout Exceeded
             13 => write!(
                 f,
diff --git a/src/cache/parser.rs b/src/cache/parser.rs
@@ -26,7 +26,7 @@ pub fn problem(problems: &mut Vec<Problem>, v: Value) -> Result<(), Error> {
         });
     }
 
-    return Ok(());
+    Ok(())
 }
 
 /// desc parser
diff --git a/src/cache/sql.rs b/src/cache/sql.rs
@@ -1,4 +1,4 @@
-pub static CREATE_PROBLEMS_IF_NOT_EXISTS: &'static str = r#"
+pub static CREATE_PROBLEMS_IF_NOT_EXISTS: &str = r#"
   CREATE TABLE IF NOT EXISTS problems (
     category TEXT NOT NULL,
     fid INTEGER NOT NULL,
@@ -14,7 +14,7 @@ pub static CREATE_PROBLEMS_IF_NOT_EXISTS: &'static str = r#"
   )
 "#;
 
-pub static CREATE_TAGS_IF_NOT_EXISTS: &'static str = r#"
+pub static CREATE_TAGS_IF_NOT_EXISTS: &str = r#"
   CREATE TABLE IF NOT EXISTS tags (
     tag TEXT NOT NULL,
     refs TEXT NOT NULL
diff --git a/src/cfg.rs b/src/cfg.rs
@@ -9,7 +9,7 @@ use serde::{Deserialize, Serialize};
 use std::{collections::HashMap, fs, path::PathBuf};
 use toml;
 
-const DEFAULT_CONFIG: &'static str = r#"
+const DEFAULT_CONFIG: &str = r#"
 # usually you don't wanna change those
 [sys]
 categories = [
diff --git a/src/cmds/data.rs b/src/cmds/data.rs
@@ -67,7 +67,7 @@ impl Command for DataCommand {
         let mut title = "\n  Cache".digit(63);
         title.push_str("Size");
         title.push_str("\n  ");
-        title.push_str(&"-".repeat(65).to_string());
+        title.push_str(&"-".repeat(65));
 
         let mut flags = 0;
         if m.is_present("delete") {
diff --git a/src/cmds/list.rs b/src/cmds/list.rs
@@ -45,11 +45,11 @@ use clap::{App, Arg, ArgMatches, SubCommand};
 /// + ...
 pub struct ListCommand;
 
-static CATEGORY_HELP: &'static str = r#"Fliter problems by category name
+static CATEGORY_HELP: &str = r#"Fliter problems by category name
 [alogrithms, database, shell]
 "#;
 
-static QUERY_HELP: &'static str = r#"Fliter questions by conditions:
+static QUERY_HELP: &str = r#"Fliter questions by conditions:
 Uppercase means negative
 e = easy     E = m+h
 m = medium   M = e+h
@@ -58,7 +58,7 @@ d = done     D = not done
 l = locked   L = not locked
 s = starred  S = not starred"#;
 
-static LIST_AFTER_HELP: &'static str = r#"EXAMPLES:
+static LIST_AFTER_HELP: &str = r#"EXAMPLES:
     leetcode list                   List all questions
     leetcode list array             List questions that has "array" in name
     leetcode list -c database       List questions that in database category
@@ -120,7 +120,7 @@ impl Command for ListCommand {
         let cache = Cache::new()?;
         let mut ps = cache.clone().get_problems()?;
 
-        if ps.len() == 0 {
+        if ps.is_empty() {
             return Self::handler(m);
         }
 
diff --git a/src/cmds/pick.rs b/src/cmds/pick.rs
@@ -31,7 +31,7 @@ use clap::{App, Arg, ArgMatches, SubCommand};
 /// ```
 pub struct PickCommand;
 
-static QUERY_HELP: &'static str = r#"Fliter questions by conditions:
+static QUERY_HELP: &str = r#"Fliter questions by conditions:
 Uppercase means negative
 e = easy     E = m+h
 m = medium   M = e+h
@@ -71,7 +71,7 @@ impl Command for PickCommand {
 
         let cache = Cache::new()?;
         let mut problems = cache.get_problems()?;
-        if problems.len() == 0 {
+        if problems.is_empty() {
             cache.clone().download_problems()?;
             Self::handler(m)?
         }
diff --git a/src/cmds/stat.rs b/src/cmds/stat.rs
@@ -44,19 +44,19 @@ impl Command for StatCommand {
             match i.level {
                 1 => {
                     easy += 1.00;
-                    if i.status == "ac".to_string() {
+                    if i.status == "ac" {
                         easy_ac += 1.00;
                     }
                 }
                 2 => {
                     medium += 1.00;
-                    if i.status == "ac".to_string() {
+                    if i.status == "ac" {
                         medium_ac += 1.00;
                     }
                 }
                 3 => {
                     hard += 1.00;
-                    if i.status == "ac".to_string() {
+                    if i.status == "ac" {
                         hard_ac += 1.00;
                     }
                 }
@@ -114,7 +114,7 @@ impl Command for StatCommand {
             print!("{}", done);
             println!("{}", udone);
         }
-        println!("");
+        println!();
         Ok(())
     }
 }
diff --git a/src/helper.rs b/src/helper.rs
@@ -70,8 +70,8 @@ mod filter {
                 'M' => ps.retain(|x| x.level != 2),
                 'h' => ps.retain(|x| x.level == 3),
                 'H' => ps.retain(|x| x.level != 3),
-                'd' => ps.retain(|x| x.status == "ac".to_string()),
-                'D' => ps.retain(|x| x.status != "ac".to_string()),
+                'd' => ps.retain(|x| x.status == "ac"),
+                'D' => ps.retain(|x| x.status != "ac"),
                 _ => {}
             }
         }
@@ -115,12 +115,11 @@ mod html {
                 for (i, e) in tks.chars().enumerate() {
                     match e {
                         '<' => {
-                            match bold {
-                                true => {
-                                    output.push(Token::Bold(tks[ptr..i].to_string()));
-                                    bold = false;
-                                }
-                                false => output.push(Token::Plain(tks[ptr..i].to_string())),
+                            if bold {
+                                output.push(Token::Bold(tks[ptr..i].to_string()));
+                                bold = false;
+                            } else {
+                                output.push(Token::Plain(tks[ptr..i].to_string()));
                             }
                             ptr = i;
                         }
diff --git a/src/lib.rs b/src/lib.rs
@@ -191,6 +191,7 @@
 //! [pr]: https://github.com/clearloop/leetcode-cli/pulls
 //! [#1]: https://github.com/clearloop/leetcode-cli/issues/1
 #![feature(try_trait)]
+#![allow(clippy::write_literal)]
 #[macro_use]
 extern crate log;
 #[macro_use]
diff --git a/src/plugins/chrome.rs b/src/plugins/chrome.rs
@@ -34,15 +34,15 @@ pub struct Ident {
 
 impl std::string::ToString for Ident {
     fn to_string(&self) -> String {
-        format!("LEETCODE_SESSION={};csrftoken={};", self.session, self.csrf).to_string()
+        format!("LEETCODE_SESSION={};csrftoken={};", self.session, self.csrf)
     }
 }
 
 /// Get cookies from chrome storage
 pub fn cookies() -> Result<Ident, crate::Error> {
     trace!("Derive cookies from google chrome...");
     let ccfg = crate::cfg::locate()?.cookies;
-    if ccfg.csrf.len() > 0 && ccfg.session.len() > 0 {
+    if !ccfg.csrf.is_empty() && !ccfg.session.is_empty() {
         return Ok(Ident {
             csrf: ccfg.csrf,
             session: ccfg.session,
@@ -66,7 +66,7 @@ pub fn cookies() -> Result<Ident, crate::Error> {
         .expect("Loading cookies from google chrome failed.");
 
     println!("res {:?}", &res);
-    if &res.len() == &(0 as usize) {
+    if res.len() == (0 as usize) {
         return Err(crate::Error::CookieError);
     }
 
@@ -77,7 +77,7 @@ pub fn cookies() -> Result<Ident, crate::Error> {
     // Decode cookies
     let mut m: HashMap<String, String> = HashMap::new();
     for c in res.to_owned() {
-        if (c.name == "csrftoken".to_string()) || (c.name == "LEETCODE_SESSION".to_string()) {
+        if (c.name == "csrftoken") || (c.name == "LEETCODE_SESSION") {
             m.insert(c.name, decode_cookies(&pass, c.encrypted_value)?);
         }
     }
diff --git a/src/plugins/leetcode.rs b/src/plugins/leetcode.rs

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ pub fn problem(problems: &mut Vec<Problem>, v: Value) -> Result<(), Error> {`
`26`	`26`	`});`
`27`	`27`	`}`
`28`	`28`
`29`		`- return Ok(());`
	`29`	`+ Ok(())`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`/// desc parser`
Original file line number	Diff line number	Diff line change
`@@ -44,19 +44,19 @@ impl Command for StatCommand {`
`44`	`44`	`match i.level {`
`45`	`45`	`1 => {`
`46`	`46`	`easy += 1.00;`
`47`		`- if i.status == "ac".to_string() {`
	`47`	`+ if i.status == "ac" {`
`48`	`48`	`easy_ac += 1.00;`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`	`2 => {`
`52`	`52`	`medium += 1.00;`
`53`		`- if i.status == "ac".to_string() {`
	`53`	`+ if i.status == "ac" {`
`54`	`54`	`medium_ac += 1.00;`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`3 => {`
`58`	`58`	`hard += 1.00;`
`59`		`- if i.status == "ac".to_string() {`
	`59`	`+ if i.status == "ac" {`
`60`	`60`	`hard_ac += 1.00;`
`61`	`61`	`}`
`62`	`62`	`}`
`@@ -114,7 +114,7 @@ impl Command for StatCommand {`
`114`	`114`	`print!("{}", done);`
`115`	`115`	`println!("{}", udone);`
`116`	`116`	`}`
`117`		`- println!("");`
	`117`	`+ println!();`
`118`	`118`	`Ok(())`
`119`	`119`	`}`
`120`	`120`	`}`