[pull] main from rust-lang:main

CHANGELOG.md

@@ -1,3 +1,10 @@
+## Unreleased
+
+### Changed
+
+- Upgrade to Rust edition 2024
+- Raise the minimum supported Rust version to `1.85`
+
 <a name="6.4.0"></a>
 
 ## 6.4.0 (2024-11-11)

Cargo.toml

@@ -15,12 +15,12 @@ authors = [
 ]
 repository = "https://github.com/rust-lang/rustlings"
 license = "MIT"
-edition = "2021" # On Update: Update the edition of the `rustfmt` command that checks the solutions.
-rust-version = "1.80"
+edition = "2024" # On Update: Update the edition of the `rustfmt` command that checks the solutions.
+rust-version = "1.85"
 
 [workspace.dependencies]
 serde = { version = "1.0.217", features = ["derive"] }
-toml_edit = { version = "0.22.22", default-features = false, features = ["parse", "serde"] }
+toml_edit = { version = "0.22.24", default-features = false, features = ["parse", "serde"] }
 
 [package]
 name = "rustlings"
@@ -47,20 +47,20 @@ include = [
 
 [dependencies]
 anyhow = "1.0.95"
-clap = { version = "4.5.26", features = ["derive"] }
+clap = { version = "4.5.30", features = ["derive"] }
 crossterm = { version = "0.28.1", default-features = false, features = ["windows", "events"] }
 notify = "8.0.0"
 os_pipe = "1.2.1"
 rustlings-macros = { path = "rustlings-macros", version = "=6.4.0" }
-serde_json = "1.0.135"
+serde_json = "1.0.138"
 serde.workspace = true
 toml_edit.workspace = true
 
 [target.'cfg(not(windows))'.dependencies]
-rustix = { version = "0.38.43", default-features = false, features = ["std", "stdio", "termios"] }
+rustix = { version = "0.38.44", default-features = false, features = ["std", "stdio", "termios"] }
 
 [dev-dependencies]
-tempfile = "3.15.0"
+tempfile = "3.17.1"
 
 [profile.release]
 panic = "abort"

dev/Cargo.toml

@@ -192,7 +192,7 @@ bin = [
 
 [package]
 name = "exercises"
-edition = "2021"
+edition = "2024"
 # Don't publish the exercises on crates.io!
 publish = false
 

release-hook.sh

@@ -13,4 +13,4 @@ cargo test --workspace --all-targets
 cargo run -- dev check --require-solutions
 
 # MSRV
-cargo +1.80 run -- dev check --require-solutions
+cargo +1.85 run -- dev check --require-solutions

solutions/13_error_handling/errors2.rs

@@ -16,7 +16,7 @@
 
 use std::num::ParseIntError;
 
-#[allow(unused_variables)]
+#[allow(unused_variables, clippy::question_mark)]
 fn total_cost(item_quantity: &str) -> Result<i32, ParseIntError> {
     let processing_fee = 1;
     let cost_per_item = 5;

src/app_state.rs

@@ -1,11 +1,11 @@
-use anyhow::{bail, Context, Error, Result};
-use crossterm::{cursor, terminal, QueueableCommand};
+use anyhow::{Context, Error, Result, bail};
+use crossterm::{QueueableCommand, cursor, terminal};
 use std::{
     collections::HashSet,
     env,
     fs::{File, OpenOptions},
     io::{Read, Seek, StdoutLock, Write},
-    path::{Path, MAIN_SEPARATOR_STR},
+    path::{MAIN_SEPARATOR_STR, Path},
     process::{Command, Stdio},
     sync::{
         atomic::{AtomicUsize, Ordering::Relaxed},
@@ -427,32 +427,34 @@ impl AppState {
                 let next_exercise_ind = &next_exercise_ind;
                 let slf = &self;
                 thread::Builder::new()
-                    .spawn_scoped(s, move || loop {
-                        let exercise_ind = next_exercise_ind.fetch_add(1, Relaxed);
-                        let Some(exercise) = slf.exercises.get(exercise_ind) else {
-                            // No more exercises.
-                            break;
-                        };
-
-                        if exercise_progress_sender
-                            .send((exercise_ind, CheckProgress::Checking))
-                            .is_err()
-                        {
-                            break;
-                        };
-
-                        let success = exercise.run_exercise(None, &slf.cmd_runner);
-                        let progress = match success {
-                            Ok(true) => CheckProgress::Done,
-                            Ok(false) => CheckProgress::Pending,
-                            Err(_) => CheckProgress::None,
-                        };
-
-                        if exercise_progress_sender
-                            .send((exercise_ind, progress))
-                            .is_err()
-                        {
-                            break;
+                    .spawn_scoped(s, move || {
+                        loop {
+                            let exercise_ind = next_exercise_ind.fetch_add(1, Relaxed);
+                            let Some(exercise) = slf.exercises.get(exercise_ind) else {
+                                // No more exercises.
+                                break;
+                            };
+
+                            if exercise_progress_sender
+                                .send((exercise_ind, CheckProgress::Checking))
+                                .is_err()
+                            {
+                                break;
+                            };
+
+                            let success = exercise.run_exercise(None, &slf.cmd_runner);
+                            let progress = match success {
+                                Ok(true) => CheckProgress::Done,
+                                Ok(false) => CheckProgress::Pending,
+                                Err(_) => CheckProgress::None,
+                            };
+
+                            if exercise_progress_sender
+                                .send((exercise_ind, progress))
+                                .is_err()
+                            {
+                                break;
+                            }
                         }
                     })
                     .context("Failed to spawn a thread to check all exercises")?;

src/cargo_toml.rs

@@ -74,13 +74,13 @@ pub fn updated_cargo_toml(
     let (bins_start_ind, bins_end_ind) = bins_start_end_ind(current_cargo_toml)?;
 
     let mut updated_cargo_toml = Vec::with_capacity(BINS_BUFFER_CAPACITY);
-    updated_cargo_toml.extend_from_slice(current_cargo_toml[..bins_start_ind].as_bytes());
+    updated_cargo_toml.extend_from_slice(&current_cargo_toml.as_bytes()[..bins_start_ind]);
     append_bins(
         &mut updated_cargo_toml,
         exercise_infos,
         exercise_path_prefix,
     );
-    updated_cargo_toml.extend_from_slice(current_cargo_toml[bins_end_ind..].as_bytes());
+    updated_cargo_toml.extend_from_slice(&current_cargo_toml.as_bytes()[bins_end_ind..]);
 
     Ok(updated_cargo_toml)
 }