Update to Rust 1.88 and let chains

ictrobot · ictrobot · commit c3b35f82b311 · 2025-06-26T20:43:19.000+01:00
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2024"
 license = "MIT"
 publish = false
 repository = "https://github.com/ictrobot/aoc-rs"
-rust-version = "1.87.0"
+rust-version = "1.88.0"
 
 [workspace.lints.clippy]
 pedantic = { level = "warn", priority = -1 }
diff --git a/crates/aoc/src/cli/arguments.rs b/crates/aoc/src/cli/arguments.rs
@@ -54,29 +54,27 @@ impl Arguments {
             }
 
             // Allow using "-" as a positional argument
-            if option.len() > 1 {
-                if let Some(option) = option.strip_prefix('-') {
-                    // Short form options
-                    let mut options: Vec<_> = option.chars().collect();
-                    let last = options.pop().unwrap();
-                    for option in options {
-                        result
-                            .handle_short(option, ArgumentValue::None)
-                            .map_err(|e| {
-                                UsageError::InvalidArguments(
-                                    format!("option -{option}: {e}").into(),
-                                )
-                            })?;
-                    }
-
-                    // The last short form option can consume a value
+            if option.len() > 1
+                && let Some(option) = option.strip_prefix('-')
+            {
+                // Short form options
+                let mut options: Vec<_> = option.chars().collect();
+                let last = options.pop().unwrap();
+                for option in options {
                     result
-                        .handle_short(last, ArgumentValue::Available(&mut args))
+                        .handle_short(option, ArgumentValue::None)
                         .map_err(|e| {
-                            UsageError::InvalidArguments(format!("option -{last}: {e}").into())
+                            UsageError::InvalidArguments(format!("option -{option}: {e}").into())
                         })?;
-                    continue;
                 }
+
+                // The last short form option can consume a value
+                result
+                    .handle_short(last, ArgumentValue::Available(&mut args))
+                    .map_err(|e| {
+                        UsageError::InvalidArguments(format!("option -{last}: {e}").into())
+                    })?;
+                continue;
             }
 
             args.push_front(option);
diff --git a/crates/aoc/src/cli/mode/test/manager.rs b/crates/aoc/src/cli/mode/test/manager.rs
@@ -181,17 +181,15 @@ impl Manager {
                 let mut max_year = None;
                 let mut succeeded = 0;
                 let mut total = 0;
-                while let Some(&(y, _)) = puzzles.peek() {
-                    if self.puzzles[y].iter().all(|p| p.get_status() == status) {
-                        max_year = Some(y);
-                        for p in &self.puzzles[y] {
-                            succeeded += p.get_succeeded();
-                            total += p.get_case_count();
-                        }
-                        take_while_peeking(&mut puzzles, |&(y2, _)| y == y2).for_each(drop);
-                    } else {
-                        break;
+                while let Some(&(y, _)) = puzzles.peek()
+                    && self.puzzles[y].iter().all(|p| p.get_status() == status)
+                {
+                    max_year = Some(y);
+                    for p in &self.puzzles[y] {
+                        succeeded += p.get_succeeded();
+                        total += p.get_case_count();
                     }
+                    take_while_peeking(&mut puzzles, |&(y2, _)| y == y2).for_each(drop);
                 }
                 if let Some(max_year) = max_year {
                     if year == max_year {
diff --git a/crates/utils/src/number.rs b/crates/utils/src/number.rs
@@ -260,11 +260,9 @@ pub fn is_prime<T: UnsignedInteger>(n: T) -> bool {
     }
 
     let mut i = T::from(5);
-    while let Some(square) = i.checked_mul(i) {
-        if square > n {
-            break;
-        }
-
+    while let Some(square) = i.checked_mul(i)
+        && square <= n
+    {
         if n % i == T::ZERO || n % (i + T::from(2)) == T::ZERO {
             return false;
         }
diff --git a/crates/xtask/src/cmd/input.rs b/crates/xtask/src/cmd/input.rs
@@ -133,10 +133,10 @@ fn read_session_token() -> Result<String, String> {
     if let Ok(token) = read_to_string(TOKEN_FILE) {
         return Ok(token.trim_end().to_string());
     }
-    if let Ok(home) = env::var(HOME_VAR) {
-        if let Ok(token) = read_to_string(Path::new(&home).join(TOKEN_FILE)) {
-            return Ok(token.trim_end().to_string());
-        }
+    if let Ok(home) = env::var(HOME_VAR)
+        && let Ok(token) = read_to_string(Path::new(&home).join(TOKEN_FILE))
+    {
+        return Ok(token.trim_end().to_string());
     }
 
     Err(format!(
diff --git a/crates/year2016/src/day07.rs b/crates/year2016/src/day07.rs
@@ -58,13 +58,15 @@ impl Day07 {
                 let (a, b, c) = (line[i], line[i + 1], line[i + 2]);
 
                 // Part 1
-                if let Some(&d) = line.get(i + 3) {
-                    if a != b && a == d && b == c {
-                        if in_brackets {
-                            part1_valid = false;
-                        } else {
-                            part1_match = true;
-                        }
+                if let Some(&d) = line.get(i + 3)
+                    && a != b
+                    && a == d
+                    && b == c
+                {
+                    if in_brackets {
+                        part1_valid = false;
+                    } else {
+                        part1_match = true;
                     }
                 }
 
diff --git a/crates/year2018/src/day05.rs b/crates/year2018/src/day05.rs
@@ -36,11 +36,11 @@ impl Day05 {
     fn react(polymer: impl Iterator<Item = u8>) -> Vec<u8> {
         let mut stack = Vec::with_capacity(polymer.size_hint().1.unwrap_or(0));
         for b in polymer {
-            if let Some(last) = stack.last() {
-                if last ^ b == 32 {
-                    stack.pop();
-                    continue;
-                }
+            if let Some(last) = stack.last()
+                && last ^ b == 32
+            {
+                stack.pop();
+                continue;
             }
             stack.push(b);
         }
diff --git a/crates/year2024/src/day09.rs b/crates/year2024/src/day09.rs
@@ -93,10 +93,10 @@ impl<'a> Day09<'a> {
 
             // Check for free spaces at least as long as the file before the file's position
             for len in file_len..=9 {
-                if let Some(&pos) = free_positions[len as usize - 1].front() {
-                    if pos < next_pos {
-                        (next_pos, free_len) = (pos, len);
-                    }
+                if let Some(&pos) = free_positions[len as usize - 1].front()
+                    && pos < next_pos
+                {
+                    (next_pos, free_len) = (pos, len);
                 }
             }
 
diff --git a/crates/year2024/src/day13.rs b/crates/year2024/src/day13.rs
@@ -82,10 +82,10 @@ impl Machine {
             return None;
         }
 
-        if let Ok(count_a) = (det_a / det_denominator).try_into() {
-            if let Ok(count_b) = (det_b / det_denominator).try_into() {
-                return Some((count_a, count_b));
-            }
+        if let Ok(count_a) = (det_a / det_denominator).try_into()
+            && let Ok(count_b) = (det_b / det_denominator).try_into()
+        {
+            return Some((count_a, count_b));
         }
 
         None
diff --git a/crates/year2024/src/day17.rs b/crates/year2024/src/day17.rs
@@ -111,10 +111,10 @@ impl Day17 {
 
         for x in 0..8 {
             let a = base | (x << (pos * 3));
-            if self.check_pos_matches(a, pos) {
-                if let Some(result) = self.search(a, pos - 1) {
-                    return Some(result);
-                }
+            if self.check_pos_matches(a, pos)
+                && let Some(result) = self.search(a, pos - 1)
+            {
+                return Some(result);
             }
         }
         None
diff --git a/crates/year2024/src/day20.rs b/crates/year2024/src/day20.rs
@@ -38,11 +38,9 @@ impl Day20 {
         distances[start] = 0;
         let mut queue = VecDeque::new();
         queue.push_back(start);
-        while let Some(index) = queue.pop_front() {
-            if index == end {
-                break;
-            }
-
+        while let Some(index) = queue.pop_front()
+            && index != end
+        {
             let Some(next_distance) = distances[index].checked_add(1) else {
                 return Err(InputError::new(input, 0, "path too long"));
             };

Original file line number	Diff line number	Diff line change
`@@ -260,11 +260,9 @@ pub fn is_prime<T: UnsignedInteger>(n: T) -> bool {`
`260`	`260`	`}`
`261`	`261`
`262`	`262`	`let mut i = T::from(5);`
`263`		`- while let Some(square) = i.checked_mul(i) {`
`264`		`- if square > n {`
`265`		`- break;`
`266`		`- }`
`267`		`-`
	`263`	`+ while let Some(square) = i.checked_mul(i)`
	`264`	`+ && square <= n`
	`265`	`+ {`
`268`	`266`	`if n % i == T::ZERO \|\| n % (i + T::from(2)) == T::ZERO {`
`269`	`267`	`return false;`
`270`	`268`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,10 +133,10 @@ fn read_session_token() -> Result<String, String> {`
`133`	`133`	`if let Ok(token) = read_to_string(TOKEN_FILE) {`
`134`	`134`	`return Ok(token.trim_end().to_string());`
`135`	`135`	`}`
`136`		`- if let Ok(home) = env::var(HOME_VAR) {`
`137`		`- if let Ok(token) = read_to_string(Path::new(&home).join(TOKEN_FILE)) {`
`138`		`- return Ok(token.trim_end().to_string());`
`139`		`- }`
	`136`	`+ if let Ok(home) = env::var(HOME_VAR)`
	`137`	`+ && let Ok(token) = read_to_string(Path::new(&home).join(TOKEN_FILE))`
	`138`	`+ {`
	`139`	`+ return Ok(token.trim_end().to_string());`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`Err(format!(`
Original file line number	Diff line number	Diff line change
`@@ -93,10 +93,10 @@ impl<'a> Day09<'a> {`
`93`	`93`
`94`	`94`	`// Check for free spaces at least as long as the file before the file's position`
`95`	`95`	`for len in file_len..=9 {`
`96`		`- if let Some(&pos) = free_positions[len as usize - 1].front() {`
`97`		`- if pos < next_pos {`
`98`		`- (next_pos, free_len) = (pos, len);`
`99`		`- }`
	`96`	`+ if let Some(&pos) = free_positions[len as usize - 1].front()`
	`97`	`+ && pos < next_pos`
	`98`	`+ {`
	`99`	`+ (next_pos, free_len) = (pos, len);`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -82,10 +82,10 @@ impl Machine {`
`82`	`82`	`return None;`
`83`	`83`	`}`
`84`	`84`
`85`		`- if let Ok(count_a) = (det_a / det_denominator).try_into() {`
`86`		`- if let Ok(count_b) = (det_b / det_denominator).try_into() {`
`87`		`- return Some((count_a, count_b));`
`88`		`- }`
	`85`	`+ if let Ok(count_a) = (det_a / det_denominator).try_into()`
	`86`	`+ && let Ok(count_b) = (det_b / det_denominator).try_into()`
	`87`	`+ {`
	`88`	`+ return Some((count_a, count_b));`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`None`
Original file line number	Diff line number	Diff line change
`@@ -111,10 +111,10 @@ impl Day17 {`
`111`	`111`
`112`	`112`	`for x in 0..8 {`
`113`	`113`	`let a = base \| (x << (pos * 3));`
`114`		`- if self.check_pos_matches(a, pos) {`
`115`		`- if let Some(result) = self.search(a, pos - 1) {`
`116`		`- return Some(result);`
`117`		`- }`
	`114`	`+ if self.check_pos_matches(a, pos)`
	`115`	`+ && let Some(result) = self.search(a, pos - 1)`
	`116`	`+ {`
	`117`	`+ return Some(result);`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`	`None`