chore(dep): bump the deps group with 9 updates (#157)

dependabot[bot] · clearloop · web-flow · commit 9b2632f8bbfb · 2024-07-05T16:15:22.000+08:00
* chore(dep): bump the deps group with 9 updates Bumps the deps group with 9 updates: | Package | From | To | | --- | --- | --- | | [clap](https://github.com/clap-rs/clap) | `4.5.4` | `4.5.8` | | [log](https://github.com/rust-lang/log) | `0.4.21` | `0.4.22` | | [pyo3](https://github.com/pyo3/pyo3) | `0.21.2` | `0.22.0` | | [serde_json](https://github.com/serde-rs/json) | `1.0.117` | `1.0.120` | | [toml](https://github.com/toml-rs/toml) | `0.8.13` | `0.8.14` | | [regex](https://github.com/rust-lang/regex) | `1.10.4` | `1.10.5` | | [clap_complete](https://github.com/clap-rs/clap) | `4.5.2` | `4.5.7` | | [diesel](https://github.com/diesel-rs/diesel) | `2.2.0` | `2.2.1` | | [reqwest](https://github.com/seanmonstar/reqwest) | `0.12.4` | `0.12.5` | Updates `clap` from 4.5.4 to 4.5.8 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](clap-rs/clap@clap_complete-v4.5.4...v4.5.8) Updates `log` from 0.4.21 to 0.4.22 - [Release notes](https://github.com/rust-lang/log/releases) - [Changelog](https://github.com/rust-lang/log/blob/master/CHANGELOG.md) - [Commits](rust-lang/log@0.4.21...0.4.22) Updates `pyo3` from 0.21.2 to 0.22.0 - [Release notes](https://github.com/pyo3/pyo3/releases) - [Changelog](https://github.com/PyO3/pyo3/blob/main/CHANGELOG.md) - [Commits](PyO3/pyo3@v0.21.2...v0.22.0) Updates `serde_json` from 1.0.117 to 1.0.120 - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](serde-rs/json@v1.0.117...v1.0.120) Updates `toml` from 0.8.13 to 0.8.14 - [Commits](toml-rs/toml@toml-v0.8.13...toml-v0.8.14) Updates `regex` from 1.10.4 to 1.10.5 - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](rust-lang/regex@1.10.4...1.10.5) Updates `clap_complete` from 4.5.2 to 4.5.7 - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](clap-rs/clap@clap_complete-v4.5.2...clap_complete-v4.5.7) Updates `diesel` from 2.2.0 to 2.2.1 - [Release notes](https://github.com/diesel-rs/diesel/releases) - [Changelog](https://github.com/diesel-rs/diesel/blob/v2.2.1/CHANGELOG.md) - [Commits](diesel-rs/diesel@v2.2.0...v2.2.1) Updates `reqwest` from 0.12.4 to 0.12.5 - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](seanmonstar/reqwest@v0.12.4...v0.12.5) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch dependency-group: deps - dependency-name: log dependency-type: direct:production update-type: version-update:semver-patch dependency-group: deps - dependency-name: pyo3 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: deps - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch dependency-group: deps - dependency-name: toml dependency-type: direct:production update-type: version-update:semver-patch dependency-group: deps - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-patch dependency-group: deps - dependency-name: clap_complete dependency-type: direct:production update-type: version-update:semver-patch dependency-group: deps - dependency-name: diesel dependency-type: direct:production update-type: version-update:semver-patch dependency-group: deps - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch dependency-group: deps ... Signed-off-by: dependabot[bot] <support@github.com> * chore(clippy): make clippy happy * chore(clippy): make clippy happy * chore(ver): bumps version to 0.4.4 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: clearloop <udtrokia@gmail.com> Co-authored-by: clearloop <tianyi.gc@gmail.com>
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,7 +4,7 @@ path = "src/bin/lc.rs"
 
 [package]
 name = "leetcode-cli"
-version = "0.4.3"
+version = "0.4.4"
 authors = ["clearloop <tianyi.gc@gmail.com>"]
 edition = "2021"
 description = "Leetcode command-line interface in rust."
@@ -18,30 +18,30 @@ readme = './README.md'
 [dependencies]
 async-trait = "0.1.80"
 tokio = { version = "1.38.0", features = ["full"] }
-clap = { version = "4.5.4", features = ["cargo"] }
+clap = { version = "4.5.8", features = ["cargo"] }
 colored = "2.1.0"
 dirs = "5.0.1"
 env_logger = "0.11.3"
 keyring = "2.3.3"
-log = "0.4.21"
+log = "0.4.22"
 openssl = "0.10.64"
-pyo3 = { version = "0.21.2", optional = true }
+pyo3 = { version = "0.22.0", optional = true }
 rand = "0.8.5"
 serde = { version = "1.0.203", features = ["derive"] }
-serde_json = "1.0.117"
-toml = "0.8.13"
-regex = "1.10.4"
+serde_json = "1.0.120"
+toml = "0.8.14"
+regex = "1.10.5"
 scraper = "0.19.0"
 anyhow = "1.0.86"
-clap_complete = "4.5.2"
+clap_complete = "4.5.7"
 thiserror = "1.0.61"
 
 [dependencies.diesel]
-version = "2.2.0"
+version = "2.2.1"
 features = ["sqlite"]
 
 [dependencies.reqwest]
-version = "0.12.4"
+version = "0.12.5"
 features = ["gzip", "json"]
 
 [features]
diff --git a/src/cache/mod.rs b/src/cache/mod.rs
@@ -23,16 +23,13 @@ pub fn conn(p: String) -> SqliteConnection {
 
 /// Condition submit or test
 #[derive(Clone, Debug)]
+#[derive(Default)]
 pub enum Run {
     Test,
+    #[default]
     Submit,
 }
 
-impl Default for Run {
-    fn default() -> Self {
-        Run::Submit
-    }
-}
 
 /// Requests if data not download
 #[derive(Clone)]
diff --git a/src/cache/parser.rs b/src/cache/parser.rs
@@ -15,12 +15,12 @@ pub fn problem(problems: &mut Vec<Problem>, v: Value) -> Option<()> {
             // Handle on leetcode-com
             Some(s) => s as i32,
             // Handle on leetcode-cn
-            None => fid_obj.as_str()?.split(" ").last()?.parse::<i32>().ok()?,
+            None => fid_obj.as_str()?.split(' ').last()?.parse::<i32>().ok()?,
         };
 
         problems.push(Problem {
             category: v.get("category_slug")?.as_str()?.to_string(),
-            fid: fid,
+            fid,
             id: stat.get("question_id")?.as_i64()? as i32,
             level: p.get("difficulty")?.as_object()?.get("level")?.as_i64()? as i32,
             locked: p.get("paid_only")?.as_bool()?,
@@ -102,7 +102,7 @@ pub fn daily(v: Value) -> Option<i32> {
         // Handle on leetcode-com
         Some(v) => v,
         // Handle on leetcode-cn
-        None => v_obj.get("todayRecord")?.as_array()?.get(0)?,
+        None => v_obj.get("todayRecord")?.as_array()?.first()?,
     }
     .as_object()?
     .get("question")?
diff --git a/src/cmds/list.rs b/src/cmds/list.rs
@@ -184,7 +184,6 @@ impl Command for ListCommand {
                 .get_many::<i32>("range")
                 .ok_or(Error::NoneError)?
                 .copied()
-                .into_iter()
                 .collect();
             ps.retain(|x| num_range[0] <= x.fid && x.fid <= num_range[1]);
         }
diff --git a/src/cmds/pick.rs b/src/cmds/pick.rs
@@ -139,11 +139,8 @@ impl Command for PickCommand {
         let fid = match m.contains_id("name") {
             // check for name specified, or closest name
             true => {
-                match m.get_one::<String>("name").map(|name| name) {
-                    Some(quesname) => match closest_named_problem(&problems, quesname) {
-                        Some(p) => p,
-                        None => 1,
-                    },
+                match m.get_one::<String>("name") {
+                    Some(quesname) => closest_named_problem(&problems, quesname).unwrap_or(1),
                     None => {
                         // Pick random without specify id
                         let problem = &problems[rand::thread_rng().gen_range(0..problems.len())];
@@ -190,7 +187,7 @@ fn closest_named_problem(problems: &Vec<Problem>, lookup_name: &str) -> Option<i
     let mut table: Vec<usize> = vec![0; (max_name_size + 1) * (lookup_name.len() + 1)];
 
     // this is guaranteed because of the earlier max None propegation
-    assert!(problems.len() > 0);
+    assert!(!problems.is_empty());
     let mut max_score = 0;
     let mut current_problem = &problems[0];
     for problem in problems {
@@ -204,7 +201,7 @@ fn closest_named_problem(problems: &Vec<Problem>, lookup_name: &str) -> Option<i
 
         if this_score > max_score {
             max_score = this_score;
-            current_problem = &problem;
+            current_problem = problem;
         }
     }
 
@@ -213,7 +210,7 @@ fn closest_named_problem(problems: &Vec<Problem>, lookup_name: &str) -> Option<i
 
 // Longest commong subsequence DP approach O(nm) space and time. Table must be at least
 // (text1.len() + 1) * (text2.len() + 1) length or greater and is mutated every call
-fn longest_common_subsequence(table: &mut Vec<usize>, text1: &str, text2: &str) -> usize {
+fn longest_common_subsequence(table: &mut [usize], text1: &str, text2: &str) -> usize {
     assert!(table.len() >= (text1.len() + 1) * (text2.len() + 1));
     let height: usize = text1.len() + 1;
     let width: usize = text2.len() + 1;
diff --git a/src/cmds/stat.rs b/src/cmds/stat.rs
@@ -81,7 +81,7 @@ impl Command for StatCommand {
         );
 
         // lines
-        for (i, l) in vec![(easy, easy_ac), (medium, medium_ac), (hard, hard_ac)]
+        for (i, l) in [(easy, easy_ac), (medium, medium_ac), (hard, hard_ac)]
             .iter()
             .enumerate()
         {
diff --git a/src/config/cookies.rs b/src/config/cookies.rs
@@ -1,7 +1,9 @@
 //! Cookies in config
-use std::str::FromStr;
-
 use serde::{Deserialize, Serialize};
+use std::{
+    fmt::{self, Display},
+    str::FromStr,
+};
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub enum LeetcodeSite {
@@ -22,12 +24,14 @@ impl FromStr for LeetcodeSite {
     }
 }
 
-impl ToString for LeetcodeSite {
-    fn to_string(&self) -> String {
-        match self {
-            LeetcodeSite::LeetcodeCom => "leetcode.com".to_string(),
-            LeetcodeSite::LeetcodeCn => "leetcode.cn".to_string(),
-        }
+impl Display for LeetcodeSite {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let s = match self {
+            LeetcodeSite::LeetcodeCom => "leetcode.com",
+            LeetcodeSite::LeetcodeCn => "leetcode.cn",
+        };
+
+        write!(f, "{s}")
     }
 }
 
@@ -49,8 +53,12 @@ impl Default for Cookies {
     }
 }
 
-impl std::string::ToString for Cookies {
-    fn to_string(&self) -> String {
-        format!("LEETCODE_SESSION={};csrftoken={};", self.session, self.csrf)
+impl Display for Cookies {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "LEETCODE_SESSION={};csrftoken={};",
+            self.session, self.csrf
+        )
     }
 }
diff --git a/src/config/storage.rs b/src/config/storage.rs
@@ -65,7 +65,7 @@ impl Storage {
             self.scripts = Some("scripts".into());
         }
 
-        let p = PathBuf::from(root).join(&self.scripts.ok_or(Error::NoneError)?);
+        let p = PathBuf::from(root).join(self.scripts.ok_or(Error::NoneError)?);
         if !PathBuf::from(&p).exists() {
             std::fs::create_dir(&p)?
         }
diff --git a/src/helper.rs b/src/helper.rs
@@ -87,7 +87,8 @@ mod filter {
         ids.iter().for_each(|x| {
             map.insert(x.to_string(), true).unwrap_or_default();
         });
-        ps.retain(|x| map.get(&x.id.to_string()).is_some());
+
+        ps.retain(|x| map.contains_key(&x.id.to_string()));
         Ok(())
     }
 }
diff --git a/src/plugins/chrome.rs b/src/plugins/chrome.rs
@@ -3,7 +3,7 @@ use anyhow::anyhow;
 use diesel::prelude::*;
 use keyring::Entry;
 use openssl::{hash, pkcs5, symm};
-use std::collections::HashMap;
+use std::{collections::HashMap, fmt::Display};
 
 /// LeetCode Cookies Schema
 mod schema {
@@ -34,9 +34,13 @@ pub struct Ident {
     session: String,
 }
 
-impl std::string::ToString for Ident {
-    fn to_string(&self) -> String {
-        format!("LEETCODE_SESSION={};csrftoken={};", self.session, self.csrf)
+impl Display for Ident {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(
+            f,
+            "LEETCODE_SESSION={};csrftoken={};",
+            self.session, self.csrf
+        )
     }
 }
 
@@ -64,7 +68,7 @@ pub fn cookies() -> Result<Ident> {
     debug!("Chrome Cookies path is {:?}", &p);
     let mut conn = cache::conn(p.to_string_lossy().to_string());
     let res = cookies
-        .filter(host_key.like(format!("#{}", ccfg.site.to_string())))
+        .filter(host_key.like(format!("#{}", ccfg.site)))
         .load::<Cookies>(&mut conn)
         .expect("Loading cookies from google chrome failed.");
 
diff --git a/src/plugins/leetcode.rs b/src/plugins/leetcode.rs
@@ -86,15 +86,13 @@ impl LeetCode {
         json.insert("variables", r#"{"slug": "$slug"}"#.replace("$slug", slug));
         json.insert(
             "query",
-            vec![
-                "query getTopicTag($slug: String!) {",
+            ["query getTopicTag($slug: String!) {",
                 "  topicTag(slug: $slug) {",
                 "    questions {",
                 "      questionId",
                 "    }",
                 "  }",
-                "}",
-            ]
+                "}"]
             .join("\n"),
         );
 
@@ -151,31 +149,27 @@ impl LeetCode {
                 json.insert("operationName", "daily".to_string());
                 json.insert(
                     "query",
-                    vec![
-                        "query daily {",
+                    ["query daily {",
                         "  activeDailyCodingChallengeQuestion {",
                         "    question {",
                         "      questionFrontendId",
                         "    }",
                         "  }",
-                        "}",
-                    ]
+                        "}"]
                     .join("\n"),
                 );
             }
             config::LeetcodeSite::LeetcodeCn => {
                 json.insert("operationName", "questionOfToday".to_string());
                 json.insert(
                     "query",
-                    vec![
-                        "query questionOfToday {",
+                    ["query questionOfToday {",
                         "  todayRecord {",
                         "    question {",
                         "      questionFrontendId",
                         "    }",
                         "  }",
-                        "}",
-                    ]
+                        "}"]
                     .join("\n"),
                 );
             }
@@ -201,8 +195,7 @@ impl LeetCode {
         let mut json: Json = HashMap::new();
         json.insert(
             "query",
-            vec![
-                "query getQuestionDetail($titleSlug: String!) {",
+            ["query getQuestionDetail($titleSlug: String!) {",
                 "  question(titleSlug: $titleSlug) {",
                 "    content",
                 "    stats",
@@ -213,8 +206,7 @@ impl LeetCode {
                 "    metaData",
                 "    translatedContent",
                 "  }",
-                "}",
-            ]
+                "}"]
             .join("\n"),
         );
 
@@ -232,7 +224,7 @@ impl LeetCode {
             json: Some(json),
             mode: Mode::Post,
             name: "get_problem_detail",
-            url: self.conf.sys.urls.graphql.into(),
+            url: self.conf.sys.urls.graphql,
         }
         .send(&self.client)
         .await
diff --git a/src/pym.rs b/src/pym.rs
@@ -16,7 +16,7 @@ pub fn exec(module: &str) -> Result<Vec<String>> {
 
     // pygil
     Python::with_gil(|py| {
-        let pym = PyModule::from_code(py, &script, "plan.py", "plan")?;
+        let pym = PyModule::from_code_bound(py, &script, "plan.py", "plan")?;
         pym.getattr("plan")?.call1((sps, stags))?.extract()
     })
     .map_err(Into::into)

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,6 @@ impl Command for ListCommand {`
`184`	`184`	`.get_many::<i32>("range")`
`185`	`185`	`.ok_or(Error::NoneError)?`
`186`	`186`	`.copied()`
`187`		`- .into_iter()`
`188`	`187`	`.collect();`
`189`	`188`	`ps.retain(\|x\| num_range[0] <= x.fid && x.fid <= num_range[1]);`
`190`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ impl Command for StatCommand {`
`81`	`81`	`);`
`82`	`82`
`83`	`83`	`// lines`
`84`		`- for (i, l) in vec![(easy, easy_ac), (medium, medium_ac), (hard, hard_ac)]`
	`84`	`+ for (i, l) in [(easy, easy_ac), (medium, medium_ac), (hard, hard_ac)]`
`85`	`85`	`.iter()`
`86`	`86`	`.enumerate()`
`87`	`87`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`	`//! Cookies in config`
`2`		`-use std::str::FromStr;`
`3`		`-`
`4`	`2`	`use serde::{Deserialize, Serialize};`
	`3`	`+use std::{`
	`4`	`+ fmt::{self, Display},`
	`5`	`+ str::FromStr,`
	`6`	`+};`
`5`	`7`
`6`	`8`	`#[derive(Clone, Debug, Deserialize, Serialize)]`
`7`	`9`	`pub enum LeetcodeSite {`
`@@ -22,12 +24,14 @@ impl FromStr for LeetcodeSite {`
`22`	`24`	`}`
`23`	`25`	`}`
`24`	`26`
`25`		`-impl ToString for LeetcodeSite {`
`26`		`- fn to_string(&self) -> String {`
`27`		`- match self {`
`28`		`- LeetcodeSite::LeetcodeCom => "leetcode.com".to_string(),`
`29`		`- LeetcodeSite::LeetcodeCn => "leetcode.cn".to_string(),`
`30`		`- }`
	`27`	`+impl Display for LeetcodeSite {`
	`28`	`+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {`
	`29`	`+ let s = match self {`
	`30`	`+ LeetcodeSite::LeetcodeCom => "leetcode.com",`
	`31`	`+ LeetcodeSite::LeetcodeCn => "leetcode.cn",`
	`32`	`+ };`
	`33`	`+`
	`34`	`+ write!(f, "{s}")`
`31`	`35`	`}`
`32`	`36`	`}`
`33`	`37`
`@@ -49,8 +53,12 @@ impl Default for Cookies {`
`49`	`53`	`}`
`50`	`54`	`}`
`51`	`55`
`52`		`-impl std::string::ToString for Cookies {`
`53`		`- fn to_string(&self) -> String {`
`54`		`- format!("LEETCODE_SESSION={};csrftoken={};", self.session, self.csrf)`
	`56`	`+impl Display for Cookies {`
	`57`	`+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {`
	`58`	`+ write!(`
	`59`	`+ f,`
	`60`	`+ "LEETCODE_SESSION={};csrftoken={};",`
	`61`	`+ self.session, self.csrf`
	`62`	`+ )`
`55`	`63`	`}`
`56`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ impl Storage {`
`65`	`65`	`self.scripts = Some("scripts".into());`
`66`	`66`	`}`
`67`	`67`
`68`		`- let p = PathBuf::from(root).join(&self.scripts.ok_or(Error::NoneError)?);`
	`68`	`+ let p = PathBuf::from(root).join(self.scripts.ok_or(Error::NoneError)?);`
`69`	`69`	`if !PathBuf::from(&p).exists() {`
`70`	`70`	`std::fs::create_dir(&p)?`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,8 @@ mod filter {`
`87`	`87`	`ids.iter().for_each(\|x\| {`
`88`	`88`	`map.insert(x.to_string(), true).unwrap_or_default();`
`89`	`89`	`});`
`90`		`- ps.retain(\|x\| map.get(&x.id.to_string()).is_some());`
	`90`	`+`
	`91`	`+ ps.retain(\|x\| map.contains_key(&x.id.to_string()));`
`91`	`92`	`Ok(())`
`92`	`93`	`}`
`93`	`94`	`}`