chore: tidy

clechasseur · clechasseur · commit 4679b7f18539 · 2025-12-14T23:41:47.000-05:00
diff --git a/aoclp/src/forth/mod.rs b/aoclp/src/forth/mod.rs
@@ -83,9 +83,11 @@ pub type Result<T> = std::result::Result<T, Error>;
 ///
 /// let mut forth = Forth::new();
 /// assert!(forth.eval("1 2 + 3 * DUP 4 SWAP").is_ok());
-/// assert!(forth
-///     .eval(": deflabox OVER DUP ; deflabox 23 deflabox")
-///     .is_ok());
+/// assert!(
+///     forth
+///         .eval(": deflabox OVER DUP ; deflabox 23 deflabox")
+///         .is_ok()
+/// );
 /// assert_eq!(&[9, 4, 9, 4, 4, 23, 4, 4], forth.stack());
 /// ```
 ///
@@ -254,9 +256,11 @@ impl Forth {
     /// use aoclp::forth::Forth;
     ///
     /// let mut forth = Forth::new();
-    /// assert!(forth
-    ///     .eval(": foo 1 ; : bar foo ; : foo 2 ; foo bar")
-    ///     .is_ok());
+    /// assert!(
+    ///     forth
+    ///         .eval(": foo 1 ; : bar foo ; : foo 2 ; foo bar")
+    ///         .is_ok()
+    /// );
     /// assert_eq!(&[2, 1], forth.stack());
     /// ```
     ///
diff --git a/aoclp/src/forth/word.rs b/aoclp/src/forth/word.rs
@@ -102,7 +102,7 @@ where
 ///
 /// use aoclp::forth;
 /// use aoclp::forth::stack::Stack;
-/// use aoclp::forth::word::{wrap_fn_word, Words};
+/// use aoclp::forth::word::{Words, wrap_fn_word};
 ///
 /// fn add_10(stack: &mut Stack, _dictionary: &Words) -> forth::Result<()> {
 ///     let value = stack.pop()?;
diff --git a/aoclp/src/forth/word/builtins.rs b/aoclp/src/forth/word/builtins.rs
@@ -3,7 +3,7 @@
 pub mod arith;
 pub mod stack;
 
-use crate::forth::word::{wrap_fn_word, Words};
+use crate::forth::word::{Words, wrap_fn_word};
 
 /// Adds all built-in [`Word`](crate::word::Word) to the given [word map](Words).
 pub fn add_builtin_words(words: &mut Words) {
diff --git a/aoclp/src/forth/word/builtins/arith.rs b/aoclp/src/forth/word/builtins/arith.rs
@@ -1,9 +1,9 @@
 //! Definition of built-in arithmetic Forth words, like `+`.
 
 use crate::forth;
+use crate::forth::Value;
 use crate::forth::stack::Stack;
 use crate::forth::word::Words;
-use crate::forth::Value;
 
 // A little helper macro to save on code duplication for simple arithmetic operators.
 macro_rules! arith_op {
diff --git a/aoclp/src/forth/word/custom.rs b/aoclp/src/forth/word/custom.rs
@@ -32,10 +32,10 @@ impl Word for CustomWord {
     ///
     /// use aoclp::forth;
     /// use aoclp::forth::stack::Stack;
+    /// use aoclp::forth::word::Words;
     /// use aoclp::forth::word::builtins::add_builtin_words;
     /// use aoclp::forth::word::custom::CustomWord;
     /// use aoclp::forth::word::value::ValueWord;
-    /// use aoclp::forth::word::Words;
     ///
     /// let mut words = Words::new();
     /// add_builtin_words(&mut words);
diff --git a/aoclp/src/forth/word/value.rs b/aoclp/src/forth/word/value.rs
@@ -3,9 +3,9 @@
 use std::rc::Rc;
 
 use crate::forth;
+use crate::forth::Value;
 use crate::forth::stack::Stack;
 use crate::forth::word::{Word, WordRc, Words};
-use crate::forth::Value;
 
 /// A Forth [`Word`] that pushes a [`Value`] on the [`Stack`] when [`call`]ed.
 ///
diff --git a/aoclp/src/looping.rs b/aoclp/src/looping.rs
@@ -112,11 +112,7 @@ where
         let prefix_len = self.prefix.len();
         self.prefix.nth(n).or_else(|| {
             self.cycle_pos = min(self.cycle_pos + (n - prefix_len), self.cycle_size);
-            if self.cycle_len() != 0 {
-                self.next()
-            } else {
-                None
-            }
+            if self.cycle_len() != 0 { self.next() } else { None }
         })
     }
 }
diff --git a/aoclp/src/positioning/direction/eight_points.rs b/aoclp/src/positioning/direction/eight_points.rs
@@ -2,7 +2,7 @@ use std::ops::{Add, AddAssign, Neg, Sub, SubAssign};
 
 use strum::{Display, EnumCount, EnumIter, EnumProperty, FromRepr};
 
-use crate::num::{one, zero, One, Zero};
+use crate::num::{One, Zero, one, zero};
 use crate::positioning::direction::{Direction, MovementDirection};
 use crate::positioning::pt::Pt;
 
diff --git a/aoclp/src/positioning/direction/four_points.rs b/aoclp/src/positioning/direction/four_points.rs
@@ -2,7 +2,7 @@ use std::ops::{Add, AddAssign, Neg, Sub, SubAssign};
 
 use strum::{Display, EnumCount, EnumIter, EnumProperty, FromRepr};
 
-use crate::num::{one, zero, One, Zero};
+use crate::num::{One, Zero, one, zero};
 use crate::positioning::direction::{Direction, MovementDirection};
 use crate::positioning::pt::Pt;
 
diff --git a/aoclp/src/positioning/pt.rs b/aoclp/src/positioning/pt.rs
@@ -10,10 +10,10 @@ use std::sync::OnceLock;
 use strum::IntoEnumIterator;
 
 use crate::captures::CapturesHelper;
-use crate::num::{zero, Signed, Zero};
+use crate::num::{Signed, Zero, zero};
+use crate::positioning::direction::MovementDirection;
 use crate::positioning::direction::eight_points::Direction8;
 use crate::positioning::direction::four_points::Direction4;
-use crate::positioning::direction::MovementDirection;
 use crate::regex::Regex;
 
 /// A point in 2D space.
diff --git a/aoclp/src/positioning/pt_3d.rs b/aoclp/src/positioning/pt_3d.rs
@@ -4,10 +4,10 @@ use std::ops::{Add, AddAssign, RangeBounds, Sub, SubAssign};
 use std::str::FromStr;
 use std::sync::OnceLock;
 
-use num::{cast, NumCast};
+use num::{NumCast, cast};
 
 use crate::captures::CapturesHelper;
-use crate::num::{zero, Signed, Zero};
+use crate::num::{Signed, Zero, zero};
 use crate::regex::Regex;
 
 /// A point in 3D space.
diff --git a/aoclp/src/positioning/turtle.rs b/aoclp/src/positioning/turtle.rs
@@ -1,7 +1,7 @@
 use std::fmt::{Display, Formatter};
 use std::ops::{Add, Neg};
 
-use crate::num::{zero, One, Zero};
+use crate::num::{One, Zero, zero};
 use crate::positioning::direction::four_points::Direction4;
 use crate::positioning::direction::{Direction, MovementDirection};
 use crate::positioning::pt::Pt;
diff --git a/aoclp_solutions/src/y2017/day_03.rs b/aoclp_solutions/src/y2017/day_03.rs
@@ -1,10 +1,10 @@
 use std::collections::HashMap;
 use std::iter;
 
-use aoclp::num::{zero, Zero};
+use aoclp::num::{Zero, zero};
 use aoclp::positioning::direction::four_points::Direction4;
 use aoclp::positioning::direction::{Direction, MovementDirection};
-use aoclp::positioning::pt::{manhattan, Pt};
+use aoclp::positioning::pt::{Pt, manhattan};
 use aoclp::solvers_impl::input::safe_get_input;
 use itertools::Itertools;
 
diff --git a/aoclp_solutions/src/y2017/day_08.rs b/aoclp_solutions/src/y2017/day_08.rs
@@ -1,4 +1,4 @@
-use std::cmp::{max, Ordering};
+use std::cmp::{Ordering, max};
 use std::collections::HashMap;
 use std::str::FromStr;
 
diff --git a/aoclp_solutions/src/y2017/day_11.rs b/aoclp_solutions/src/y2017/day_11.rs
@@ -1,7 +1,7 @@
 use std::iter::successors;
 
-use aoclp::num::{zero, Zero};
-use aoclp::positioning::pt::{manhattan, Pt};
+use aoclp::num::{Zero, zero};
+use aoclp::positioning::pt::{Pt, manhattan};
 use aoclp::solvers_impl::input::safe_get_input_as_one_vec;
 use itertools::Itertools;
 use strum::EnumString;
diff --git a/aoclp_solutions/src/y2017/day_16.rs b/aoclp_solutions/src/y2017/day_16.rs
@@ -1,7 +1,7 @@
 use std::fmt::{Display, Formatter};
 use std::str::FromStr;
 
-use aoclp::anyhow::{anyhow, Context};
+use aoclp::anyhow::{Context, anyhow};
 use aoclp::looping::LoopingItertools;
 use aoclp::solvers_impl::input::safe_get_input_as_one_vec;
 use itertools::Itertools;
diff --git a/aoclp_solutions/src/y2017/day_18.rs b/aoclp_solutions/src/y2017/day_18.rs
@@ -2,10 +2,10 @@ use std::cell::RefCell;
 use std::rc::Rc;
 use std::str::FromStr;
 
-use aoclp::anyhow::{anyhow, Context};
+use aoclp::anyhow::{Context, anyhow};
 use aoclp::solvers_impl::input::safe_get_input_as_many;
 
-use crate::y2017::helpers::duet::{read_register, read_value, Queue, Registers, Value};
+use crate::y2017::helpers::duet::{Queue, Registers, Value, read_register, read_value};
 
 pub fn part_1() -> i64 {
     let program = input().into();
diff --git a/aoclp_solutions/src/y2017/day_20.rs b/aoclp_solutions/src/y2017/day_20.rs
@@ -6,7 +6,7 @@ use std::sync::OnceLock;
 
 use aoclp::captures::CapturesHelper;
 use aoclp::num::zero;
-use aoclp::positioning::pt_3d::{manhattan, Pt3d};
+use aoclp::positioning::pt_3d::{Pt3d, manhattan};
 use aoclp::regex::Regex;
 use aoclp::solvers_impl::input::safe_get_input_as_many;
 use itertools::Itertools;
diff --git a/aoclp_solutions/src/y2017/day_23.rs b/aoclp_solutions/src/y2017/day_23.rs
@@ -1,13 +1,13 @@
 use std::collections::HashMap;
 use std::str::FromStr;
 
-use aoclp::anyhow::{anyhow, Context};
+use aoclp::anyhow::{Context, anyhow};
 use aoclp::solvers_impl::input::safe_get_input_as_many;
 use itertools::Itertools;
 use primes::is_prime;
 use strum::EnumDiscriminants;
 
-use crate::y2017::helpers::duet::{read_register, read_value, Registers, Value};
+use crate::y2017::helpers::duet::{Registers, Value, read_register, read_value};
 
 pub fn part_1() -> usize {
     let program = Program::default();
diff --git a/aoclp_solutions/src/y2024/day_04.rs b/aoclp_solutions/src/y2024/day_04.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
 use std::iter::successors;
 
 use aoclp::positioning::direction::eight_points::Direction8;
-use aoclp::positioning::pt::{matrix_to_map, Pt};
+use aoclp::positioning::pt::{Pt, matrix_to_map};
 use aoclp::solvers_impl::input::safe_get_input_as_terrain;
 use strum::IntoEnumIterator;
 
diff --git a/aoclp_solutions/src/y2024/day_07.rs b/aoclp_solutions/src/y2024/day_07.rs
@@ -2,7 +2,7 @@ use std::iter::once;
 
 use aoclp::forth::Forth;
 use aoclp::solvers_impl::input::safe_get_input_as_many_vecs;
-use itertools::{repeat_n, Itertools};
+use itertools::{Itertools, repeat_n};
 
 pub fn part_1() -> i64 {
     solve(true)
@@ -25,14 +25,8 @@ const OPS: &[&str] = &["+", "*", "||"];
 
 fn possible_ops(num: usize, elusive_elephants: bool) -> impl Iterator<Item = Vec<String>> {
     let num_ops = if elusive_elephants { OPS.len() - 1 } else { OPS.len() };
-    repeat_n(
-        OPS.iter()
-            .take(num_ops)
-            .map(<_>::to_string)
-            .collect_vec(),
-        num,
-    )
-    .multi_cartesian_product()
+    repeat_n(OPS.iter().take(num_ops).map(<_>::to_string).collect_vec(), num)
+        .multi_cartesian_product()
 }
 
 #[derive(Debug, Clone)]
diff --git a/aoclp_solutions/src/y2024/day_08.rs b/aoclp_solutions/src/y2024/day_08.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
 use std::iter::successors;
 use std::ops::Range;
 
-use aoclp::positioning::pt::{matrix_to_map, Pt};
+use aoclp::positioning::pt::{Pt, matrix_to_map};
 use aoclp::solvers_impl::input::safe_get_input_as_terrain;
 use itertools::Itertools;
 
diff --git a/aoclp_solutions/src/y2024/day_10.rs b/aoclp_solutions/src/y2024/day_10.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use aoclp::dij;
 use aoclp::positioning::direction::four_points::Direction4;
-use aoclp::positioning::pt::{matrix_to_map, Pt};
+use aoclp::positioning::pt::{Pt, matrix_to_map};
 use aoclp::solvers_impl::input::safe_get_input_as_terrain;
 use strum::IntoEnumIterator;
 
diff --git a/aoclp_solutions/src/y2025/day_04.rs b/aoclp_solutions/src/y2025/day_04.rs
@@ -1,6 +1,6 @@
 use std::collections::{BTreeSet, HashSet};
 
-use aoclp::positioning::pt::{filtered_matrix_to_map, Pt};
+use aoclp::positioning::pt::{Pt, filtered_matrix_to_map};
 use aoclp::solvers_impl::input::safe_get_input_as_terrain;
 
 pub fn part_1() -> usize {
diff --git a/aoclp_solutions/src/y2025/day_07.rs b/aoclp_solutions/src/y2025/day_07.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use aoclp::positioning::direction::four_points::Direction4;
-use aoclp::positioning::pt::{matrix_to_map, Pt};
+use aoclp::positioning::pt::{Pt, matrix_to_map};
 use aoclp::solvers_impl::input::safe_get_input_as_terrain;
 use derive_where::derive_where;
 use itertools::Itertools;
diff --git a/aoclp_solutions/src/y2025/day_08.rs b/aoclp_solutions/src/y2025/day_08.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use aoclp::num::zero;
-use aoclp::positioning::pt_3d::{euclidian_squared, Pt3d};
+use aoclp::positioning::pt_3d::{Pt3d, euclidian_squared};
 use aoclp::solvers_impl::input::safe_get_input_as_many;
 use itertools::Itertools;
 
diff --git a/aoclp_solutions/src/y2025/day_09.rs b/aoclp_solutions/src/y2025/day_09.rs
@@ -3,8 +3,8 @@ use std::iter::once;
 
 use aoclp::positioning::direction::four_points::Direction4;
 use aoclp::positioning::direction::{Direction, MovementDirection};
-use aoclp::positioning::pt::{min_max, rectangle_corners, rectangular_area, Pt};
-use aoclp::solvers_impl::input::{safe_get_input_as_many, Input};
+use aoclp::positioning::pt::{Pt, min_max, rectangle_corners, rectangular_area};
+use aoclp::solvers_impl::input::{Input, safe_get_input_as_many};
 use itertools::Itertools;
 use strum::IntoEnumIterator;
 
diff --git a/aoclp_solutions/src/y2025/day_10.rs b/aoclp_solutions/src/y2025/day_10.rs
@@ -3,7 +3,7 @@ use std::sync::OnceLock;
 
 use aoclp::anyhow::Context;
 use aoclp::regex::Regex;
-use aoclp::solvers_impl::input::{safe_get_input_as_many, Input};
+use aoclp::solvers_impl::input::{Input, safe_get_input_as_many};
 use itertools::Itertools;
 use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
 use z3::ast::Int;
diff --git a/aoclp_solutions/src/y2025/day_12.rs b/aoclp_solutions/src/y2025/day_12.rs
@@ -1,10 +1,11 @@
 use std::str::FromStr;
 use std::sync::OnceLock;
-use itertools::Itertools;
+
 use aoclp::anyhow::Context;
 use aoclp::captures::CapturesHelper;
 use aoclp::regex::Regex;
 use aoclp::solvers_impl::input::safe_get_input;
+use itertools::Itertools;
 
 pub fn part_1() -> usize {
     let input = input();
@@ -54,10 +55,9 @@ impl FromStr for Region {
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         static REGEX: OnceLock<Regex> = OnceLock::new();
-        let re =
-            REGEX.get_or_init(|| {
-                Regex::new(r"^(?<width>\d+)x(?<height>\d+):\s+(?<presents>(?:\d+\s*)+)$").unwrap()
-            });
+        let re = REGEX.get_or_init(|| {
+            Regex::new(r"^(?<width>\d+)x(?<height>\d+):\s+(?<presents>(?:\d+\s*)+)$").unwrap()
+        });
 
         let captures = re
             .captures(s)
@@ -86,10 +86,7 @@ where
     S: AsRef<str> + Clone,
 {
     static INDEX_REGEX: OnceLock<Regex> = OnceLock::new();
-    let index_re =
-        INDEX_REGEX.get_or_init(|| {
-            Regex::new(r"^(?<idx>\d+):\s*$").unwrap()
-        });
+    let index_re = INDEX_REGEX.get_or_init(|| Regex::new(r"^(?<idx>\d+):\s*$").unwrap());
 
     let mut it = input.into_iter().peekable();
     let mut presents = Vec::new();
diff --git a/codingquest_clp_solutions/src/problem_15.rs b/codingquest_clp_solutions/src/problem_15.rs
@@ -1,6 +1,6 @@
 use std::collections::{HashMap, HashSet, VecDeque};
 
-use codingquest_clp::aoclp::positioning::pt::{matrix_to_map, Pt};
+use codingquest_clp::aoclp::positioning::pt::{Pt, matrix_to_map};
 use codingquest_clp::solvers_impl::input::get_input;
 use itertools::Itertools;
 
diff --git a/codingquest_clp_solutions/src/problem_16.rs b/codingquest_clp_solutions/src/problem_16.rs
@@ -35,7 +35,9 @@ impl Message {
             .unwrap();
 
         if invalid_row_checksum_diff != invalid_col_checksum_diff {
-            panic!("Invalid row {invalid_row}'s checksum diff ({invalid_row_checksum_diff}) is not equal to col {invalid_col}'s checksum diff ({invalid_col_checksum_diff})!");
+            panic!(
+                "Invalid row {invalid_row}'s checksum diff ({invalid_row_checksum_diff}) is not equal to col {invalid_col}'s checksum diff ({invalid_col_checksum_diff})!"
+            );
         }
 
         let wrong_byte = self.data[invalid_row][invalid_col];

Original file line number	Diff line number	Diff line change
`@@ -112,11 +112,7 @@ where`
`112`	`112`	`let prefix_len = self.prefix.len();`
`113`	`113`	`self.prefix.nth(n).or_else(\|\| {`
`114`	`114`	`self.cycle_pos = min(self.cycle_pos + (n - prefix_len), self.cycle_size);`
`115`		`- if self.cycle_len() != 0 {`
`116`		`- self.next()`
`117`		`- } else {`
`118`		`- None`
`119`		`- }`
	`115`	`+ if self.cycle_len() != 0 { self.next() } else { None }`
`120`	`116`	`})`
`121`	`117`	`}`
`122`	`118`	`}`