Rust 2024 Edition

Author: maneatingape

.github/workflows/checks.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - run: rustup default 1.84
+    - run: rustup default 1.85
     - run: cargo test
 
   test-nightly:

.github/workflows/docs.yml

@@ -18,7 +18,7 @@ jobs:
       url: ${{ steps.deployment.outputs.page_url }}
     steps:
       - uses: actions/checkout@v4
-      - run: rustup default 1.84
+      - run: rustup default 1.85
       - run: cargo doc
         env:
           RUSTDOCFLAGS: "--document-private-items --default-theme=ayu --deny warnings"

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "aoc"
 version = "2024.12.25"
-edition = "2021"
-rust-version = "1.84"
+edition = "2024"
+rust-version = "1.85"
 
 [features]
 frivolity = []
@@ -14,9 +14,11 @@ private_intra_doc_links = "allow"
 [lints.rust]
 absolute_paths_not_starting_with_crate = "warn"
 ambiguous_negative_literals = "warn"
+closure-returning-async-block = "warn"
 elided_lifetimes_in_paths = "warn"
 explicit_outlives_requirements = "warn"
 ffi_unwind_calls = "warn"
+if-let-rescope = "warn"
 let_underscore_drop = "warn"
 macro_use_extern_crate = "warn"
 meta_variable_misuse = "warn"
@@ -26,7 +28,6 @@ missing_debug_implementations = "allow"
 missing_docs = "allow"
 missing_unsafe_on_extern = "warn"
 non_ascii_idents = "warn"
-non_local_definitions = "warn"
 redundant_imports = "warn"
 redundant_lifetimes = "warn"
 single_use_lifetimes = "warn"
@@ -83,6 +84,7 @@ default_trait_access = "warn"
 default_union_representation = "warn"
 deref_by_slicing = "allow"
 disallowed_script_idents = "warn"
+doc_include_without_cfg = "warn"
 doc_link_with_quotes = "warn"
 doc_markdown = "warn"
 else_if_without_else = "allow"

rustfmt.toml

@@ -1,2 +1 @@
-style_edition = "2024"
 use_small_heuristics = "Max"

src/year2019/day25.rs

@@ -134,7 +134,7 @@ fn play_automatically(input: &[i64]) -> String {
                 too_light.insert(current);
                 continue;
             }
-        };
+        }
 
         if matches!(movement_noisy(&mut computer, &last, &mut output), State::Halted) {
             // Keep only the password digits from Santa's response.

src/year2021/day19.rs

@@ -191,10 +191,9 @@ pub fn parse(input: &str) -> Vec<Located> {
         let mut next_unknown = Vec::new();
 
         while let Some(scanner) = unknown.pop() {
-            if let Some(found) = check(&known, &scanner) {
-                todo.push(Located::from(scanner, found));
-            } else {
-                next_unknown.push(scanner);
+            match check(&known, &scanner) {
+                Some(found) => todo.push(Located::from(scanner, found)),
+                None => next_unknown.push(scanner),
             }
         }
 

src/year2022/day17.rs

@@ -96,7 +96,7 @@ impl Iterator for State<'_> {
             // Check for a horizontal collision (this does not prevent downwards movement).
             if candidate & chunk == 0 {
                 shape = candidate;
-            };
+            }
 
             // The neat part of using bitwise AND to compare is that we can check all four
             // rows in a single operation, including both walls and the existing tower.