From cf414e3959f313adc83d984191b6e0541b5825d9 Mon Sep 17 00:00:00 2001 From: Charles Lechasseur Date: Sun, 29 Jun 2025 10:44:50 -0400 Subject: [PATCH 1/3] chore: make clippy happy by not using `bool::then` Clippy is right, it's a bit ugly. --- aoclp/src/looping.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/aoclp/src/looping.rs b/aoclp/src/looping.rs index daccc2d..700ac86 100644 --- a/aoclp/src/looping.rs +++ b/aoclp/src/looping.rs @@ -112,9 +112,10 @@ 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); - (self.cycle_len() != 0) - .then(|| self.next()) - .unwrap_or_default() + match self.cycle_len() { + 0 => None, + _ => self.next(), + } }) } } From a7a7dcfab71743a8f23130821a11a182ce9e1148 Mon Sep 17 00:00:00 2001 From: Charles Lechasseur Date: Sun, 29 Jun 2025 10:45:39 -0400 Subject: [PATCH 2/3] chore: fix new clippy warning in Rust 1.88 --- aoclp_solutions/src/y2017/day_09.rs | 6 +++--- aoclp_solutions/src/y2017/day_14.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aoclp_solutions/src/y2017/day_09.rs b/aoclp_solutions/src/y2017/day_09.rs index c20dece..08d6d2f 100644 --- a/aoclp_solutions/src/y2017/day_09.rs +++ b/aoclp_solutions/src/y2017/day_09.rs @@ -26,14 +26,14 @@ impl Group { match chars.next() { Some('{') => (), - Some(c) => panic!("invalid starting character in stream: {}", c), + Some(c) => panic!("invalid starting character in stream: {c}"), None => panic!("empty stream"), } let root = Self::parse(&mut chars, 0); if let Some(c) = chars.next() { - panic!("invalid character after outermost group in stream: {}", c); + panic!("invalid character after outermost group in stream: {c}"); } root @@ -67,7 +67,7 @@ impl Group { '{' => group.children.push(Self::parse(chars, group.score())), '}' => return group, ',' => (), - _ => panic!("invalid non-garbage character found in stream: {}", c), + _ => panic!("invalid non-garbage character found in stream: {c}"), } } diff --git a/aoclp_solutions/src/y2017/day_14.rs b/aoclp_solutions/src/y2017/day_14.rs index 5cca0ab..e73a70f 100644 --- a/aoclp_solutions/src/y2017/day_14.rs +++ b/aoclp_solutions/src/y2017/day_14.rs @@ -24,7 +24,7 @@ impl Disk { let input = input(); Self { hashes: (0..128) - .map(|row| KnotHash::new(format!("{}-{}", input, row))) + .map(|row| KnotHash::new(format!("{input}-{row}"))) .collect(), } } From bd89a663819b0e3bf9201573248df33702a113e3 Mon Sep 17 00:00:00 2001 From: Charles Lechasseur Date: Sun, 29 Jun 2025 10:47:32 -0400 Subject: [PATCH 3/3] chore: make code even easier to read with `if ... else` --- aoclp/src/looping.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/aoclp/src/looping.rs b/aoclp/src/looping.rs index 700ac86..c945115 100644 --- a/aoclp/src/looping.rs +++ b/aoclp/src/looping.rs @@ -112,9 +112,10 @@ 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); - match self.cycle_len() { - 0 => None, - _ => self.next(), + if self.cycle_len() != 0 { + self.next() + } else { + None } }) }