2023: Rust 2024 edition

Author: Peter554

2023/rust/aoc/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "aoc"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

2023/rust/aoc/benches/benchmark.rs

@@ -1,5 +1,5 @@
 use aoc::day20;
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use std::path::Path;
 
 pub fn criterion_benchmark(c: &mut Criterion) {

2023/rust/aoc/src/day18/mod.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
 use itertools::Itertools;
-use std::{fs, isize, path::Path};
+use std::{fs, path::Path};
 
 pub fn part1(input_path: &Path) -> Result<i64> {
     let input = fs::read_to_string(input_path)?;
@@ -92,7 +92,7 @@ fn get_n_boundary_coordinates(vertices: &[(isize, isize)]) -> isize {
     vertices
         .iter()
         .circular_tuple_windows::<(_, _)>()
-        .map(|window| (window.1 .0 - window.0 .0).abs() + (window.1 .1 - window.0 .1).abs())
+        .map(|window| (window.1.0 - window.0.0).abs() + (window.1.1 - window.0.1).abs())
         .sum::<isize>()
 }
 
@@ -101,7 +101,7 @@ fn get_n_interior_coordinates(vertices: &[(isize, isize)]) -> isize {
     let area = vertices
         .iter()
         .circular_tuple_windows::<(_, _)>()
-        .map(|window| window.0 .0 * window.1 .1 - window.1 .0 * window.0 .1)
+        .map(|window| window.0.0 * window.1.1 - window.1.0 * window.0.1)
         .sum::<isize>()
         / 2;
 

2023/rust/aoc/src/day19/mod.rs

@@ -67,7 +67,7 @@ fn parse_input(input: &str) -> (HashMap<String, Workflow>, Vec<Part>) {
                 .collect();
             let else_outcome = s
                 .clone()
-                .last()
+                .next_back()
                 .unwrap()
                 .strip_suffix('}')
                 .unwrap()
@@ -120,9 +120,9 @@ fn is_accepted(workflows: &HashMap<String, Workflow>, workflow: &str, part: &Par
     if workflow.else_outcome == "A" {
         true
     } else if workflow.else_outcome == "R" {
-        return false;
+        false
     } else {
-        return is_accepted(workflows, &workflow.else_outcome, part);
+        is_accepted(workflows, &workflow.else_outcome, part)
     }
 }
 
@@ -165,9 +165,9 @@ fn find_accepted_hypercubes(
     if workflow.else_outcome == "A" {
         vec![hypercube.clone()]
     } else if workflow.else_outcome == "R" {
-        return vec![];
+        vec![]
     } else {
-        return find_accepted_hypercubes(workflows, &workflow.else_outcome, hypercube);
+        find_accepted_hypercubes(workflows, &workflow.else_outcome, hypercube)
     }
 }
 

2023/rust/aoc/src/day22/mod.rs

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use itertools::Itertools;
 use slotmap::{DefaultKey, SecondaryMap, SlotMap};
-use std::{cmp::Ordering, collections::HashSet, fs, path::Path, usize};
+use std::{cmp::Ordering, collections::HashSet, fs, path::Path};
 
 pub fn part1(input_path: &Path) -> Result<i64> {
     let input = fs::read_to_string(input_path)?;