Merge pull request #287 from ben1009/tool-chain

just have fun, no reason

Author: mergify[bot]

.github/workflows/check.yml

@@ -12,7 +12,7 @@ concurrency:
 
 env:    
   CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
-  RUST_TOOLCHAIN: nightly-2025-02-01
+  RUST_TOOLCHAIN: nightly-2025-07-01
 
 name: Check
 jobs:

.github/workflows/test.yml

@@ -12,7 +12,7 @@ concurrency:
 
 env:    
   CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
-  RUST_TOOLCHAIN: nightly-2025-02-01
+  RUST_TOOLCHAIN: nightly-2025-07-01
 
 name: Test
 jobs:

Makefile.toml

@@ -13,7 +13,7 @@ min_version = "0.36.10"
 [tasks.install-nextest]
 category = "Misc"
 description = "install cargo-nextest"
-install_crate = { crate_name = "cargo-nextest", version = "0.9.87", binary = "cargo", test_arg = [
+install_crate = { crate_name = "cargo-nextest", version = "0.9.96", binary = "cargo", test_arg = [
     "nextest",
     "--help",
 ] }
@@ -50,7 +50,7 @@ args = ["fmt", "--all"]
 [tasks.check-typos]
 category = "Dev - check"
 description = "Run cargo typos-cli check"
-install_crate = { version = "1.28.4", crate_name = "typos-cli", binary = "typos", test_arg = [
+install_crate = { version = "1.32.0", crate_name = "typos-cli", binary = "typos", test_arg = [
     "--help",
 ] }
 script = """
@@ -80,7 +80,7 @@ cargo hakari verify > /dev/null
 [tasks.check-machete]
 category = "Dev - check"
 description = "Run cargo machete check"
-install_crate = { version = "0.7.0", crate_name = "cargo-machete", binary = "cargo", test_arg = [
+install_crate = { version = "0.8.0", crate_name = "cargo-machete", binary = "cargo", test_arg = [
     "machete",
     "--help",
 ] }

rust-toolchain

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2025-02-01"
+channel = "nightly-2025-07-01"

src/main.rs

@@ -120,7 +120,7 @@ fn main() {
         } else {
             _id = id_arg
                 .parse::<u32>()
-                .unwrap_or_else(|_| panic!("not a number: {}", id_arg));
+                .unwrap_or_else(|_| panic!("not a number: {id_arg}"));
             if initialized_ids.contains(&_id) {
                 println!("The problem you chose has been initialized in problem/");
                 continue;
@@ -129,9 +129,8 @@ fn main() {
 
         let problem = fetcher::get_problem(_id).unwrap_or_else(|| {
             panic!(
-                "Error: failed to get problem #{} \
-                 (The problem may be paid-only or may not be exist).",
-                _id
+                "Error: failed to get problem #{_id} \
+                 (The problem may be paid-only or may not be exist)."
             )
         });
         let code = problem.code_definition.iter().find(|&d| d.value == *"rust");
@@ -157,9 +156,8 @@ fn generate_random_id(except_ids: &[u32]) -> u32 {
             return res;
         }
         println!(
-            "Generate a random num ({}), but it is invalid (the problem may have been solved \
-             or may have no rust version). Regenerate..",
-            res
+            "Generate a random num ({res}), but it is invalid (the problem may have been solved \
+             or may have no rust version). Regenerate.."
         );
     }
 }
@@ -291,7 +289,7 @@ fn deal_solving(id: &u32) {
         problem.question_id,
         problem.title_slug.replace('-', "_")
     );
-    let file_path = Path::new("./src/problem").join(format!("{}.rs", file_name));
+    let file_path = Path::new("./src/problem").join(format!("{file_name}.rs"));
     // check problem/ existence
     if !file_path.exists() {
         panic!("problem does not exist");
@@ -302,15 +300,15 @@ fn deal_solving(id: &u32) {
         problem.question_id,
         problem.title_slug.replace('-', "_")
     );
-    let solution_path = Path::new("./src/solution").join(format!("{}.rs", solution_name));
+    let solution_path = Path::new("./src/solution").join(format!("{solution_name}.rs"));
     if solution_path.exists() {
         panic!("solution exists");
     }
     // rename/move file
     fs::rename(file_path, solution_path).unwrap();
     // remove from problem/mod.rs
     let mod_file = "./src/problem/mod.rs";
-    let target_line = format!("mod {};", file_name);
+    let target_line = format!("mod {file_name};");
     let lines: Vec<String> = io::BufReader::new(File::open(mod_file).unwrap())
         .lines()
         .map(|x| x.unwrap())
@@ -322,7 +320,7 @@ fn deal_solving(id: &u32) {
         .append(true)
         .open("./src/solution/mod.rs")
         .unwrap();
-    let _ = writeln!(lib_file, "mod {};", solution_name);
+    let _ = writeln!(lib_file, "mod {solution_name};");
 }
 
 fn deal_problem(problem: &Problem, code: &CodeDefinition, write_mod_file: bool) {
@@ -331,8 +329,7 @@ fn deal_problem(problem: &Problem, code: &CodeDefinition, write_mod_file: bool)
         problem.question_id,
         problem.title_slug.replace('-', "_")
     );
-    let file_path = Path::new("./src/problem").join(format!("{}.rs", file_name));
-
+    let file_path = Path::new("./src/problem").join(format!("{file_name}.rs"));
     let template = fs::read_to_string("./template.rs").unwrap();
     let source = template
         .replace("__PROBLEM_TITLE__", &problem.title)
@@ -361,7 +358,7 @@ fn deal_problem(problem: &Problem, code: &CodeDefinition, write_mod_file: bool)
             .append(true)
             .open("./src/problem/mod.rs")
             .unwrap();
-        let _ = writeln!(lib_file, "pub mod {};", file_name);
+        let _ = writeln!(lib_file, "pub mod {file_name};");
     }
 }
 
@@ -378,9 +375,9 @@ mod test {
         // pub mod p0001_two_sum;
         pub mod p0002_add_two_numbers;
         pub mod p0003_longest_substring_without_repeating_characters;"#;
-        writeln!(file, "{}", content).unwrap();
+        writeln!(file, "{content}").unwrap();
         let ids = get_initialized_ids(path.to_str().unwrap());
-        println!("{:?}", ids);
+        println!("{ids:?}");
         assert!(ids.len() == 2);
         assert!(ids[0] == 2);
         assert!(ids[1] == 3);

src/problem/mod.rs

@@ -62,6 +62,7 @@ pub mod p1016_binary_string_with_substrings_representing_1_to_n;
 pub mod p1054_distant_barcodes;
 pub mod p1186_maximum_subarray_sum_with_one_deletion;
 pub mod p1376_time_needed_to_inform_all_employees;
+pub mod p1608_special_array;
 pub mod p2437_number_of_valid_clock_times;
 pub mod p2671_frequency_tracker;
 pub mod p2708_maximum_strength_of_a_group;

src/problem/p0014_longest_common_prefix.rs

@@ -1,5 +1,3 @@
-use std::cmp;
-
 /// [14] Longest Common Prefix
 ///
 /// Write a function to find the longest common prefix string amongst an array of strings.
@@ -32,23 +30,22 @@ pub struct Solution {}
 impl Solution {
     pub fn longest_common_prefix(strs: Vec<String>) -> String {
         if strs.len() == 1 {
-            return strs[0].clone();
+            return strs[0].to_string();
         }
 
-        let mut ret = strs[0].as_bytes();
+        let mut ret = strs[0].to_string();
         for str in strs.iter().skip(1) {
-            let t = str.as_bytes();
             let mut j = 0;
-            while j < cmp::min(ret.len(), t.len()) {
-                if ret[j] != t[j] {
+            while j < std::cmp::min(ret.len(), str.len()) {
+                if ret.as_bytes()[j] != str.as_bytes()[j] {
                     break;
                 }
                 j += 1;
             }
-            ret = &ret[0..j];
+            ret = ret[..j].to_string();
         }
 
-        String::from_utf8_lossy(ret).to_string()
+        ret
     }
 }
 

src/problem/p0017_letter_combinations_of_a_phone_number.rs

@@ -36,7 +36,7 @@ pub struct Solution {}
 impl Solution {
     pub fn letter_combinations(digits: String) -> Vec<String> {
         if digits.is_empty() {
-            return Vec::new();
+            return vec![];
         }
 
         let dic = HashMap::from([
@@ -51,26 +51,28 @@ impl Solution {
         ]);
 
         let mut ret = vec![];
-        Self::dfs(digits.as_bytes(), 0, &dic, &mut vec![], &mut ret);
+        Self::dfs(digits.as_bytes(), &dic, 0, &mut vec![], &mut ret);
 
         ret
     }
 
     fn dfs(
         digits: &[u8],
-        idx: usize,
         dic: &HashMap<u8, &str>,
+        idx: usize,
         tmp: &mut Vec<u8>,
         ret: &mut Vec<String>,
     ) {
         if tmp.len() == digits.len() {
-            ret.push(String::from_utf8(tmp.clone()).unwrap());
+            ret.push(String::from_utf8_lossy(tmp).to_string());
+
             return;
         }
 
-        for c in dic[&digits[idx]].as_bytes() {
-            tmp.push(*c);
-            Self::dfs(digits, idx + 1, dic, tmp, ret);
+        let s = dic[&digits[idx]].as_bytes();
+        for item in s {
+            tmp.push(*item);
+            Solution::dfs(digits, dic, idx + 1, tmp, ret);
             tmp.pop();
         }
     }

src/problem/p0019_remove_nth_node_from_end_of_list.rs

@@ -54,16 +54,17 @@ use crate::util::linked_list::ListNode;
 // }
 impl Solution {
     pub fn remove_nth_from_end(head: Option<Box<ListNode>>, n: i32) -> Option<Box<ListNode>> {
-        let mut root_pointer = ListNode { val: 0, next: head };
+        let mut root_pointer = ListNode::new(0);
+        root_pointer.next = head.clone();
         let mut pre = &mut root_pointer;
-        let mut current = &pre.clone();
-        for _i in 0..n {
-            current = current.next.as_ref().unwrap();
-        }
+        let mut head = head.as_ref().unwrap();
 
-        while let Some(ref n) = current.next {
-            current = n;
+        for _ in 1..n {
+            head = head.next.as_ref().unwrap();
+        }
+        while let Some(n) = head.next.as_ref() {
             pre = pre.next.as_mut().unwrap();
+            head = n;
         }
         pre.next = pre.next.as_mut().unwrap().next.take();
 

src/problem/p0020_valid_parentheses.rs

@@ -43,20 +43,16 @@ impl Solution {
             return false;
         }
 
+        let dic = HashMap::from([(')', '('), (']', '['), ('}', '{')]);
         let mut stack = vec![];
-        let s = s.as_bytes();
-        let map = HashMap::from([(b'}', b'{'), (b')', b'('), (b']', b'[')]);
-        for v in s {
-            if let Some(t) = stack.last() {
-                if let Some(p) = map.get(v) {
-                    if p == t {
-                        stack.pop();
-                        continue;
-                    }
+        for c in s.chars() {
+            if let t @ Some(_) = stack.last() {
+                if t == dic.get(&c) {
+                    stack.pop();
                 }
+            } else {
+                stack.push(c);
             }
-
-            stack.push(*v);
         }
 
         stack.is_empty()