Update to Rust 1.85 and 2024 edition

Author: ictrobot

Cargo.toml

@@ -6,18 +6,21 @@ default-members = ["crates/aoc", "crates/utils", "crates/year*"]
 
 [workspace.package]
 authors = ["Ethan Jones <[email protected]>"]
-edition = "2021"
+edition = "2024"
 license = "MIT"
 publish = false
 repository = "https://github.com/ictrobot/aoc-rs"
-rust-version = "1.83.0"
+rust-version = "1.85.0"
 
 [workspace.lints.clippy]
 pedantic = { level = "warn", priority = -1 }
+allow_attributes = "deny"
+dbg_macro = "warn"
 missing_errors_doc = "allow"
 missing_panics_doc = "allow"
 module_name_repetitions = "allow"
-allow_attributes = "deny"
+print_stderr = "warn"
+print_stdout = "warn"
 
 [profile.release]
 debug = "limited"

crates/aoc/src/cli/options.rs

@@ -1,9 +1,9 @@
-use aoc::{PuzzleFn, PUZZLES};
+use aoc::{PUZZLES, PuzzleFn};
 use std::collections::VecDeque;
 use std::error::Error;
 use std::num::NonZeroUsize;
 use utils::date::{Day, Year};
-use utils::multiversion::{Version, VERSIONS};
+use utils::multiversion::{VERSIONS, Version};
 
 #[derive(Debug, Default)]
 pub struct Options {
@@ -88,7 +88,7 @@ impl Options {
 
     pub fn help(&self) -> String {
         format!(
-            r#"Usage:
+            r"Usage:
     {program_name}
         Run all solutions
 
@@ -109,7 +109,7 @@ Options:
     --help/-h
         Print this help
 
-{cargo_repo}"#,
+{cargo_repo}",
             program_name = self.program_name.as_ref().map_or("aoc", String::as_str),
             multiversion_options = *VERSIONS,
             cargo_repo = env!("CARGO_PKG_REPOSITORY"),

crates/aoc/src/lib.rs

@@ -2,5 +2,5 @@ mod puzzles;
 mod years;
 
 pub use ::utils;
-pub use puzzles::{PuzzleFn, PUZZLES};
+pub use puzzles::{PUZZLES, PuzzleFn};
 pub use years::*;

crates/aoc/src/main.rs

@@ -10,6 +10,7 @@ use utils::multiversion::Version;
 
 mod cli;
 
+#[expect(clippy::print_stdout, clippy::print_stderr)]
 fn main() {
     let args = match Options::parse() {
         Ok(x) => x,

crates/aoc/src/puzzles.rs

@@ -4,8 +4,8 @@ use utils::date::{Day, Year};
 // These imports are unused if none of the year features are enabled
 #[allow(clippy::allow_attributes, unused_imports)]
 use utils::{
-    input::{InputError, InputType},
     Puzzle,
+    input::{InputError, InputType},
 };
 
 /// Represents a wrapper function around a puzzle solution.

crates/aoc_wasm/src/lib.rs

@@ -77,6 +77,8 @@ fn run(
 
 unsafe fn write_string(buf: *mut u8, str: &str) {
     let len = str.len().min(BUFFER_LENGTH - 1);
-    std::ptr::copy_nonoverlapping(str.as_ptr(), buf, len);
-    *buf.add(len) = 0;
+    unsafe {
+        std::ptr::copy_nonoverlapping(str.as_ptr(), buf, len);
+        *buf.add(len) = 0;
+    }
 }

crates/aoc_wasm/src/multithreading.rs

@@ -1,5 +1,5 @@
 use aoc::utils::wasm::scoped_tasks::worker;
-use std::alloc::{alloc_zeroed, Layout};
+use std::alloc::{Layout, alloc_zeroed};
 
 /// Allocate stack for worker threads.
 ///

crates/utils/src/multiversion.rs

@@ -13,7 +13,7 @@ mod then;
 pub use base::*;
 pub use error::ParseError;
 pub use iterator::{ParserIterator, ParserMatchesIterator};
-pub use number::{i128, i16, i32, i64, i8, number_range, u128, u16, u32, u64, u8};
+pub use number::{i8, i16, i32, i64, i128, number_range, u8, u16, u32, u64, u128};
 pub use one_of::one_of;
 pub use simple::{byte, byte_range, constant, eof, eol, noop, take_while, take_while1};
 

crates/utils/src/parser/mod.rs

@@ -57,7 +57,7 @@
 use std::any::Any;
 use std::collections::VecDeque;
 use std::marker::PhantomData;
-use std::panic::{catch_unwind, resume_unwind, AssertUnwindSafe};
+use std::panic::{AssertUnwindSafe, catch_unwind, resume_unwind};
 use std::sync::mpsc::{SyncSender, TrySendError};
 use std::sync::{Arc, Condvar, Mutex};
 
@@ -170,7 +170,6 @@ impl<'scope, 'env> Scope<'scope, 'env> {
                 // returning too soon, while the closures still exist, which causes UB as detected
                 // by Miri.
                 let panicked = closure();
-                dbg!("finished");
                 scope_data.task_end(panicked);
             },
         ));