Update Cargo dependencies and toolchain configuration, formatting and

yousiki · yousiki · commit 1223a7b3b951 · 2025-06-21T14:53:52.000+08:00
fixing rust code.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,48 +5,48 @@ path = "src/bin/lc.rs"
 [package]
 name = "leetcode-cli"
 version = "0.4.6"
-authors = ["clearloop <tianyi.gc@gmail.com>"]
+authors = ["clearloop <tianyi.gc@gmail.com>", "yousiki <you.siki@outlook.com>"]
 edition = "2021"
-description = "Leetcode command-line interface in rust."
-repository = "https://github.com/clearloop/leetcode-cli"
+description = "Leetcode command-line interface in rust. Forked by yousiki."
+repository = "https://github.com/yousiki/leetcode-cli"
 license = "MIT"
 documentation = "https://docs.rs/leetcode_cli"
-homepage = "https://github.com/clearloop/leetcode-cli"
+homepage = "https://github.com/yousiki/leetcode-cli"
 keywords = ["cli", "games", "leetcode"]
 readme = './README.md'
 
 [dependencies]
 async-trait = "0.1.88"
-tokio = { version = "1.44.2", features = ["full"] }
-clap = { version = "4.5.37", features = ["cargo"] }
+tokio = { version = "1.45.1", features = ["full"] }
+clap = { version = "4.5.40", features = ["cargo"] }
 colored = "3.0.0"
 dirs = "6.0.0"
-env_logger = "0.11.6"
+env_logger = "0.11.8"
 keyring = "3.6.2"
 log = "0.4.27"
-openssl = "0.10.72"
+openssl = "0.10.73"
 pyo3 = { version = "0.24.2", optional = true }
 rand = "0.9.1"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
-toml = "0.8.22"
+toml = "0.8.23"
 regex = "1.11.1"
 scraper = "0.23.1"
 anyhow = "1.0.98"
-clap_complete = "4.5.48"
+clap_complete = "4.5.54"
 thiserror = "2.0.12"
 unicode-width = "0.2"
 
 [dependencies.diesel]
-version = "2.2.10"
+version = "2.2.11"
 features = ["sqlite"]
 
 [dependencies.reqwest]
-version = "0.12.15"
+version = "0.12.20"
 features = ["gzip", "json"]
 
 [features]
 pym = ["pyo3"]
 
 [target.'cfg(target_family = "unix")'.dependencies]
-nix = { version = "0.30.0", features = [ "signal" ] }
+nix = { version = "0.30.1", features = ["signal"] }
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,10 +1,4 @@
 [toolchain]
 channel = "stable"
-components = [
-  "rustc",
-  "cargo",
-  "rustfmt",
-  "clippy",
-  "rust-analyzer",
-]
+components = ["cargo", "clippy", "rust-analyzer", "rustc", "rustfmt"]
 profile = "minimal"
diff --git a/rustfmt.toml b/rustfmt.toml
@@ -1,2 +1,2 @@
-edition = "2021"
+edition = "2024"
 tab_spaces = 4
diff --git a/src/cache/mod.rs b/src/cache/mod.rs
@@ -22,15 +22,13 @@ pub fn conn(p: String) -> SqliteConnection {
 }
 
 /// Condition submit or test
-#[derive(Clone, Debug)]
-#[derive(Default)]
+#[derive(Clone, Debug, Default)]
 pub enum Run {
     Test,
     #[default]
     Submit,
 }
 
-
 /// Requests if data not download
 #[derive(Clone)]
 pub struct Cache(pub LeetCode);
@@ -188,7 +186,7 @@ impl Cache {
                         Err(Error::CookieError)
                     } else {
                         Err(Error::PremiumError)
-                    }
+                    };
                 }
                 Some(true) => (),
             }
diff --git a/src/cache/models.rs b/src/cache/models.rs
@@ -1,11 +1,11 @@
 //! Leetcode data models
-use unicode_width::UnicodeWidthStr;
-use unicode_width::UnicodeWidthChar;
 use super::schemas::{problems, tags};
 use crate::helper::HTML;
 use colored::Colorize;
 use serde::{Deserialize, Serialize};
 use serde_json::Number;
+use unicode_width::UnicodeWidthChar;
+use unicode_width::UnicodeWidthStr;
 
 /// Tag model
 #[derive(Clone, Insertable, Queryable, Serialize, Debug)]
diff --git a/src/cache/parser.rs b/src/cache/parser.rs
@@ -15,7 +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(' ')
+                .next_back()?
+                .parse::<i32>()
+                .ok()?,
         };
 
         problems.push(Problem {
@@ -132,7 +137,7 @@ pub fn user(v: Value) -> Option<Option<(String, bool)>> {
 pub use ss::ssr;
 /// string or squence
 mod ss {
-    use serde::{de, Deserialize, Deserializer};
+    use serde::{Deserialize, Deserializer, de};
     use std::fmt;
     use std::marker::PhantomData;
 
diff --git a/src/cli.rs b/src/cli.rs
@@ -1,8 +1,8 @@
 //! Clap Commanders
 use crate::{
     cmds::{
-        completion_handler, Command, CompletionCommand, DataCommand, EditCommand, ExecCommand,
-        ListCommand, PickCommand, StatCommand, TestCommand,
+        Command, CompletionCommand, DataCommand, EditCommand, ExecCommand, ListCommand,
+        PickCommand, StatCommand, TestCommand, completion_handler,
     },
     err::Error,
     flag::{Debug, Flag},
diff --git a/src/cmds/completions.rs b/src/cmds/completions.rs
@@ -4,16 +4,16 @@ use super::Command;
 use crate::err::Error;
 use async_trait::async_trait;
 use clap::{Arg, ArgAction, ArgMatches, Command as ClapCommand};
-use clap_complete::{generate, Generator, Shell};
+use clap_complete::{Generator, Shell, generate};
 
 /// Abstract shell completions command
 ///
 /// ```sh
 /// Generate shell Completions
-
+///
 /// USAGE:
 ///     leetcode completions <shell>
-
+///
 /// ARGUMENTS:
 ///     <shell>  [possible values: bash, elvish, fish, powershell, zsh]
 /// ```
@@ -36,15 +36,17 @@ impl Command for CompletionCommand {
     async fn handler(_m: &ArgMatches) -> Result<(), Error> {
         // defining custom handler to print the completions. Handler method signature limits taking
         // other params. We need &ArgMatches and &mut ClapCommand to generate completions.
-        println!("Don't use this handler. Does not implement the functionality to print completions. Use completions_handler() below.");
+        println!(
+            "Don't use this handler. Does not implement the functionality to print completions. Use completions_handler() below."
+        );
         Ok(())
     }
 }
 
-fn get_completions_string<G: Generator>(gen: G, cmd: &mut ClapCommand) -> Result<String, Error> {
+fn get_completions_string<G: Generator>(g: G, cmd: &mut ClapCommand) -> Result<String, Error> {
     let mut v: Vec<u8> = Vec::new();
     let name = cmd.get_name().to_string();
-    generate(gen, cmd, name, &mut v);
+    generate(g, cmd, name, &mut v);
     Ok(String::from_utf8(v)?)
 }
 
diff --git a/src/cmds/data.rs b/src/cmds/data.rs
@@ -1,6 +1,6 @@
 //! Cache managger
 use super::Command;
-use crate::{cache::Cache, helper::Digit, Error};
+use crate::{Error, cache::Cache, helper::Digit};
 use async_trait::async_trait;
 use clap::{Arg, ArgAction, ArgMatches, Command as ClapCommand};
 use colored::Colorize;
diff --git a/src/cmds/edit.rs b/src/cmds/edit.rs
@@ -61,7 +61,7 @@ impl Command for EditCommand {
 
     /// `edit` handler
     async fn handler(m: &ArgMatches) -> Result<()> {
-        use crate::{cache::models::Question, Cache};
+        use crate::{Cache, cache::models::Question};
         use std::fs::File;
         use std::io::Write;
         use std::path::Path;
diff --git a/src/cmds/mod.rs b/src/cmds/mod.rs
@@ -32,7 +32,7 @@ mod list;
 mod pick;
 mod stat;
 mod test;
-pub use completions::{completion_handler, CompletionCommand};
+pub use completions::{CompletionCommand, completion_handler};
 pub use data::DataCommand;
 pub use edit::EditCommand;
 pub use exec::ExecCommand;
diff --git a/src/cmds/stat.rs b/src/cmds/stat.rs
@@ -30,7 +30,7 @@ impl Command for StatCommand {
 
     /// `stat` handler
     async fn handler(_m: &ArgMatches) -> Result<(), crate::err::Error> {
-        use crate::{helper::Digit, Cache};
+        use crate::{Cache, helper::Digit};
 
         let cache = Cache::new()?;
         let res = cache.get_problems()?;
diff --git a/src/config/mod.rs b/src/config/mod.rs
@@ -6,8 +6,8 @@
 //! + Edit leetcode.toml at `~/.leetcode/leetcode.toml` directly
 //! + Use `leetcode config` to update it
 use crate::{
-    config::{code::Code, cookies::Cookies, storage::Storage, sys::Sys},
     Error, Result,
+    config::{code::Code, cookies::Cookies, storage::Storage, sys::Sys},
 };
 use serde::{Deserialize, Serialize};
 use std::{fs, path::Path};
diff --git a/src/helper.rs b/src/helper.rs
@@ -191,7 +191,7 @@ mod file {
         }
     }
 
-    use crate::{cache::models::Problem, Error};
+    use crate::{Error, cache::models::Problem};
 
     /// Generate test cases path by fid
     pub fn test_cases_path(problem: &Problem) -> crate::Result<String> {
diff --git a/src/plugins/chrome.rs b/src/plugins/chrome.rs
@@ -1,4 +1,4 @@
-use crate::{cache, Error, Result};
+use crate::{Error, Result, cache};
 use anyhow::anyhow;
 use diesel::prelude::*;
 use keyring::Entry;
diff --git a/src/plugins/leetcode.rs b/src/plugins/leetcode.rs
@@ -1,11 +1,11 @@
 use self::req::{Json, Mode, Req};
 use crate::{
-    config::{self, Config},
     Result,
+    config::{self, Config},
 };
 use reqwest::{
-    header::{HeaderMap, HeaderName, HeaderValue},
     Client, ClientBuilder, Response,
+    header::{HeaderMap, HeaderName, HeaderValue},
 };
 use std::{collections::HashMap, str::FromStr, time::Duration};
 
@@ -86,13 +86,15 @@ impl LeetCode {
         json.insert("variables", r#"{"slug": "$slug"}"#.replace("$slug", slug));
         json.insert(
             "query",
-            ["query getTopicTag($slug: String!) {",
+            [
+                "query getTopicTag($slug: String!) {",
                 "  topicTag(slug: $slug) {",
                 "    questions {",
                 "      questionId",
                 "    }",
                 "  }",
-                "}"]
+                "}",
+            ]
             .join("\n"),
         );
 
@@ -149,27 +151,31 @@ impl LeetCode {
                 json.insert("operationName", "daily".to_string());
                 json.insert(
                     "query",
-                    ["query daily {",
+                    [
+                        "query daily {",
                         "  activeDailyCodingChallengeQuestion {",
                         "    question {",
                         "      questionFrontendId",
                         "    }",
                         "  }",
-                        "}"]
+                        "}",
+                    ]
                     .join("\n"),
                 );
             }
             config::LeetcodeSite::LeetcodeCn => {
                 json.insert("operationName", "questionOfToday".to_string());
                 json.insert(
                     "query",
-                    ["query questionOfToday {",
+                    [
+                        "query questionOfToday {",
                         "  todayRecord {",
                         "    question {",
                         "      questionFrontendId",
                         "    }",
                         "  }",
-                        "}"]
+                        "}",
+                    ]
                     .join("\n"),
                 );
             }
@@ -195,7 +201,8 @@ impl LeetCode {
         let mut json: Json = HashMap::new();
         json.insert(
             "query",
-            ["query getQuestionDetail($titleSlug: String!) {",
+            [
+                "query getQuestionDetail($titleSlug: String!) {",
                 "  question(titleSlug: $titleSlug) {",
                 "    content",
                 "    stats",
@@ -206,7 +213,8 @@ impl LeetCode {
                 "    metaData",
                 "    translatedContent",
                 "  }",
-                "}"]
+                "}",
+            ]
             .join("\n"),
         );
 
@@ -269,7 +277,7 @@ impl LeetCode {
 mod req {
     use super::LeetCode;
     use crate::err::Error;
-    use reqwest::{header::HeaderMap, Client, Response};
+    use reqwest::{Client, Response, header::HeaderMap};
     use std::collections::HashMap;
 
     /// Standardize json format
diff --git a/src/pym.rs b/src/pym.rs
@@ -1,7 +1,7 @@
 //! This module is for python scripts.
 //!
 //! Seems like some error exists now, welocome pr to fix this : )
-use crate::{cache::Cache, helper::load_script, Result};
+use crate::{Result, cache::Cache, helper::load_script};
 use pyo3::prelude::*;
 
 /// Exec python scripts as filter

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-edition = "2021"`
	`1`	`+edition = "2024"`
`2`	`2`	`tab_spaces = 4`
Original file line number	Diff line number	Diff line change
`@@ -22,15 +22,13 @@ pub fn conn(p: String) -> SqliteConnection {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`/// Condition submit or test`
`25`		`-#[derive(Clone, Debug)]`
`26`		`-#[derive(Default)]`
	`25`	`+#[derive(Clone, Debug, Default)]`
`27`	`26`	`pub enum Run {`
`28`	`27`	`Test,`
`29`	`28`	`#[default]`
`30`	`29`	`Submit,`
`31`	`30`	`}`
`32`	`31`
`33`		`-`
`34`	`32`	`/// Requests if data not download`
`35`	`33`	`#[derive(Clone)]`
`36`	`34`	`pub struct Cache(pub LeetCode);`
`@@ -188,7 +186,7 @@ impl Cache {`
`188`	`186`	`Err(Error::CookieError)`
`189`	`187`	`} else {`
`190`	`188`	`Err(Error::PremiumError)`
`191`		`- }`
	`189`	`+ };`
`192`	`190`	`}`
`193`	`191`	`Some(true) => (),`
`194`	`192`	`}`