Merge pull request #190 from ia7ck/update-2025-10

ia7ck · web-flow · commit 99dfc4678587 · 2025-10-18T02:33:50.000+09:00
2025-10 update
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "3"
 members = [
     "libs/*",
     "tool/oj_test",
diff --git a/libs/arithmetic_series/Cargo.toml b/libs/arithmetic_series/Cargo.toml
@@ -2,7 +2,7 @@
 name = "arithmetic_series"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/auxiliary_tree/Cargo.toml b/libs/auxiliary_tree/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "auxiliary_tree"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
 license = "CC0-1.0"
 
diff --git a/libs/avl_tree/Cargo.toml b/libs/avl_tree/Cargo.toml
@@ -2,7 +2,7 @@
 name = "avl_tree"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/avl_tree/src/lib.rs b/libs/avl_tree/src/lib.rs
@@ -178,7 +178,7 @@ where
 
     /// 集合にxが含まれるかを返す。
     pub fn contains(&self, x: &T) -> bool {
-        self.find_last(x).map_or(false, |node| x.eq(&node.x))
+        self.find_last(x).is_some_and(|node| x.eq(&node.x))
     }
 
     /// xを追加する。集合にxが含まれていなかった場合trueを返す。
@@ -370,11 +370,7 @@ where
             }
         }
 
-        if hit {
-            Ok(count)
-        } else {
-            Err(count)
-        }
+        if hit { Ok(count) } else { Err(count) }
     }
 }
 
@@ -424,7 +420,7 @@ impl<'a, T> Iterator for Iter<'a, T> {
 }
 
 impl<T> AvlTree<T> {
-    pub fn iter(&self) -> Iter<T> {
+    pub fn iter(&self) -> Iter<'_, T> {
         Iter::new(&self.root)
     }
 }
diff --git a/libs/binary_search_range/Cargo.toml b/libs/binary_search_range/Cargo.toml
@@ -2,7 +2,7 @@
 name = "binary_search_range"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/cumulative_sum_2d/Cargo.toml b/libs/cumulative_sum_2d/Cargo.toml
@@ -2,7 +2,7 @@
 name = "cumulative_sum_2d"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/detect_cycle/Cargo.toml b/libs/detect_cycle/Cargo.toml
@@ -2,7 +2,7 @@
 name = "detect_cycle"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/detect_cycle/examples/judge_cycle_detection.rs b/libs/detect_cycle/examples/judge_cycle_detection.rs
@@ -1,6 +1,6 @@
 use proconio::{
     input,
-    source::{once::OnceSource, Source},
+    source::{Source, once::OnceSource},
 };
 
 use std::env;
diff --git a/libs/dijkstra/Cargo.toml b/libs/dijkstra/Cargo.toml
@@ -2,7 +2,7 @@
 name = "dijkstra"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/dijkstra/examples/judge_shortest_path.rs b/libs/dijkstra/examples/judge_shortest_path.rs
@@ -1,6 +1,6 @@
 use proconio::{
     input,
-    source::{once::OnceSource, Source},
+    source::{Source, once::OnceSource},
 };
 
 use std::fs::File;
diff --git a/libs/dijkstra/examples/shortest_path.rs b/libs/dijkstra/examples/shortest_path.rs
@@ -1,6 +1,6 @@
 //problem: https://judge.yosupo.jp/problem/shortest_path
 //judge_program_rs: ./judge_shortest_path.rs
-use dijkstra::{dijkstra, ConstEdge};
+use dijkstra::{ConstEdge, dijkstra};
 use proconio::{fastout, input};
 
 #[fastout]
diff --git a/libs/dijkstra/src/lib.rs b/libs/dijkstra/src/lib.rs
@@ -132,7 +132,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use crate::{dijkstra, ConstEdge};
+    use crate::{ConstEdge, dijkstra};
     use rand::distributions::Uniform;
     use rand::prelude::*;
 
diff --git a/libs/divisors/Cargo.toml b/libs/divisors/Cargo.toml
@@ -2,7 +2,7 @@
 name = "divisors"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/ext_gcd/Cargo.toml b/libs/ext_gcd/Cargo.toml
@@ -2,7 +2,7 @@
 name = "ext_gcd"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/ext_gcd/src/lib.rs b/libs/ext_gcd/src/lib.rs
@@ -15,11 +15,7 @@
 pub fn ext_gcd(a: i64, b: i64) -> (i64, i64, i64) {
     if b == 0 {
         // ax + 0y = a
-        if a == 0 {
-            (0, 0, 0)
-        } else {
-            (1, 0, a)
-        }
+        if a == 0 { (0, 0, 0) } else { (1, 0, a) }
     } else {
         let (q, r) = (a / b, a % b);
         // a = bq + r, ax + by = g
diff --git a/libs/factorials/Cargo.toml b/libs/factorials/Cargo.toml
@@ -2,7 +2,7 @@
 name = "factorials"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/factorials/src/lib.rs b/libs/factorials/src/lib.rs
@@ -72,9 +72,11 @@ impl Factorial {
     /// Factorial::new_checking_modulo_prime(10, 42);
     /// ```
     pub fn new_checking_modulo_prime(size: usize, modulo: u64) -> Self {
-        assert!((2..modulo)
-            .take_while(|&x| x * x <= modulo)
-            .all(|x| modulo % x != 0));
+        assert!(
+            (2..modulo)
+                .take_while(|&x| x * x <= modulo)
+                .all(|x| modulo % x != 0)
+        );
         Self::new(size, modulo)
     }
 
diff --git a/libs/fenwick_tree/Cargo.toml b/libs/fenwick_tree/Cargo.toml
@@ -2,7 +2,7 @@
 name = "fenwick_tree"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/floor_sqrt/Cargo.toml b/libs/floor_sqrt/Cargo.toml
@@ -2,7 +2,7 @@
 name = "floor_sqrt"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/floor_sqrt/src/lib.rs b/libs/floor_sqrt/src/lib.rs
@@ -13,7 +13,7 @@
 /// ```
 pub fn floor_sqrt(n: u64) -> u64 {
     let mut ok = 0;
-    let mut ng = std::u32::MAX as u64;
+    let mut ng = u64::from(u32::MAX);
     while ng - ok > 1 {
         let m = (ng + ok) / 2;
         if m * m <= n {
diff --git a/libs/graph/Cargo.toml b/libs/graph/Cargo.toml
@@ -2,7 +2,7 @@
 name = "graph"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/grid_search/Cargo.toml b/libs/grid_search/Cargo.toml
@@ -2,7 +2,7 @@
 name = "grid_search"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/least_prime_factors/Cargo.toml b/libs/least_prime_factors/Cargo.toml
@@ -2,7 +2,7 @@
 name = "least_prime_factors"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/lowest_common_ancestor/Cargo.toml b/libs/lowest_common_ancestor/Cargo.toml
@@ -2,7 +2,7 @@
 name = "lowest_common_ancestor"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/lowest_common_ancestor/src/lib.rs b/libs/lowest_common_ancestor/src/lib.rs
@@ -24,7 +24,7 @@ pub struct LowestCommonAncestor {
     depth: Vec<usize>,
 }
 
-const ILLEGAL: usize = std::usize::MAX;
+const ILLEGAL: usize = usize::MAX;
 
 impl LowestCommonAncestor {
     /// 頂点数 `n`, 根 `root`, 木をなす無向辺の集合 `edges` を渡します。
diff --git a/libs/mod_int/Cargo.toml b/libs/mod_int/Cargo.toml
@@ -2,7 +2,7 @@
 name = "mod_int"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/next_permutation/Cargo.toml b/libs/next_permutation/Cargo.toml
@@ -2,7 +2,7 @@
 name = "next_permutation"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/pascal_triangle/Cargo.toml b/libs/pascal_triangle/Cargo.toml
@@ -2,7 +2,7 @@
 name = "pascal_triangle"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/prime_factorization/Cargo.toml b/libs/prime_factorization/Cargo.toml
@@ -2,7 +2,7 @@
 name = "prime_factorization"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/re_rooting_dp/Cargo.toml b/libs/re_rooting_dp/Cargo.toml
@@ -1,7 +1,9 @@
 [package]
 name = "re_rooting_dp"
 version = "0.1.0"
-edition = "2021"
+authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
+edition = "2024"
+license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/libs/rolling_hash/Cargo.toml b/libs/rolling_hash/Cargo.toml
@@ -2,7 +2,7 @@
 name = "rolling_hash"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/run_length/Cargo.toml b/libs/run_length/Cargo.toml
@@ -2,7 +2,7 @@
 name = "run_length"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/scanner/Cargo.toml b/libs/scanner/Cargo.toml
@@ -2,7 +2,7 @@
 name = "scanner"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/segment_tree/Cargo.toml b/libs/segment_tree/Cargo.toml
@@ -2,7 +2,7 @@
 name = "segment_tree"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/sliding_window/Cargo.toml b/libs/sliding_window/Cargo.toml
@@ -2,7 +2,7 @@
 name = "sliding_window"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/strongly_connected_components/Cargo.toml b/libs/strongly_connected_components/Cargo.toml
@@ -2,7 +2,7 @@
 name = "strongly_connected_components"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/strongly_connected_components/examples/judge_scc.rs b/libs/strongly_connected_components/examples/judge_scc.rs
@@ -1,6 +1,6 @@
 use proconio::{
     input,
-    source::{once::OnceSource, Source},
+    source::{Source, once::OnceSource},
 };
 
 use std::env;
diff --git a/libs/suffix_array/Cargo.toml b/libs/suffix_array/Cargo.toml
@@ -2,7 +2,7 @@
 name = "suffix_array"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/topological_sort/Cargo.toml b/libs/topological_sort/Cargo.toml
@@ -2,7 +2,7 @@
 name = "topological_sort"
 version = "0.1.0"
 authors = ["ia7ck <23146842+ia7ck@users.noreply.github.com>"]
-edition = "2021"
+edition = "2024"
 license = "CC0-1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/libs/topological_sort/src/lib.rs b/libs/topological_sort/src/lib.rs
@@ -36,11 +36,7 @@ pub fn topological_sort(n: usize, edges: &[(usize, usize)]) -> Option<Vec<usize>
         }
     }
     assert!(order.len() <= n);
-    if order.len() == n {
-        Some(order)
-    } else {
-        None
-    }
+    if order.len() == n { Some(order) } else { None }
 }
 
 #[cfg(test)]
diff --git a/libs/treap/Cargo.toml b/libs/treap/Cargo.toml
diff --git a/libs/treap/src/lib.rs b/libs/treap/src/lib.rs
diff --git a/libs/tree_diameter/Cargo.toml b/libs/tree_diameter/Cargo.toml
diff --git a/libs/union_find/Cargo.toml b/libs/union_find/Cargo.toml
diff --git a/libs/z_algorithm/Cargo.toml b/libs/z_algorithm/Cargo.toml
diff --git a/libs/zarts/Cargo.toml b/libs/zarts/Cargo.toml
diff --git a/rust-toolchain b/rust-toolchain
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
diff --git a/tool/bundle/Cargo.toml b/tool/bundle/Cargo.toml
diff --git a/tool/bundle/src/main.rs b/tool/bundle/src/main.rs
diff --git a/tool/oj_test/Cargo.toml b/tool/oj_test/Cargo.toml
diff --git a/tool/oj_test/src/lib.rs b/tool/oj_test/src/lib.rs
diff --git a/tool/oj_test_examples/simple_example/Cargo.toml b/tool/oj_test_examples/simple_example/Cargo.toml
diff --git a/tool/oj_test_examples/special_judge_example/Cargo.toml b/tool/oj_test_examples/special_judge_example/Cargo.toml
diff --git a/tool/oj_test_examples/special_judge_example/examples/judge.rs b/tool/oj_test_examples/special_judge_example/examples/judge.rs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`[workspace]`
	`2`	`+resolver = "3"`
`2`	`3`	`members = [`
`3`	`4`	`"libs/*",`
`4`	`5`	`"tool/oj_test",`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ where`
`178`	`178`
`179`	`179`	`/// 集合にxが含まれるかを返す。`
`180`	`180`	`pub fn contains(&self, x: &T) -> bool {`
`181`		`- self.find_last(x).map_or(false, \|node\| x.eq(&node.x))`
	`181`	`+ self.find_last(x).is_some_and(\|node\| x.eq(&node.x))`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`/// xを追加する。集合にxが含まれていなかった場合trueを返す。`
`@@ -370,11 +370,7 @@ where`
`370`	`370`	`}`
`371`	`371`	`}`
`372`	`372`
`373`		`- if hit {`
`374`		`- Ok(count)`
`375`		`- } else {`
`376`		`- Err(count)`
`377`		`- }`
	`373`	`+ if hit { Ok(count) } else { Err(count) }`
`378`	`374`	`}`
`379`	`375`	`}`
`380`	`376`
`@@ -424,7 +420,7 @@ impl<'a, T> Iterator for Iter<'a, T> {`
`424`	`420`	`}`
`425`	`421`
`426`	`422`	`impl<T> AvlTree<T> {`
`427`		`- pub fn iter(&self) -> Iter<T> {`
	`423`	`+ pub fn iter(&self) -> Iter<'_, T> {`
`428`	`424`	`Iter::new(&self.root)`
`429`	`425`	`}`
`430`	`426`	`}`