[pull] main from rust-lang:main

Cargo.toml

@@ -15,7 +15,7 @@ authors = [
 ]
 repository = "https://github.com/rust-lang/rustlings"
 license = "MIT"
-edition = "2024" # On Update: Update the edition of the `rustfmt` command that checks the solutions.
+edition = "2024" # On Update: Update the edition of `rustfmt` in `dev check` and `CARGO_TOML` in `dev new`.
 rust-version = "1.85"
 
 [workspace.dependencies]

solutions/03_if/if1.rs

@@ -1,9 +1,5 @@
 fn bigger(a: i32, b: i32) -> i32 {
-    if a > b {
-        a
-    } else {
-        b
-    }
+    if a > b { a } else { b }
 }
 
 fn main() {

solutions/11_hashmaps/hashmaps3.rs

@@ -60,9 +60,11 @@ England,Spain,1,0";
     fn build_scores() {
         let scores = build_scores_table(RESULTS);
 
-        assert!(["England", "France", "Germany", "Italy", "Poland", "Spain"]
-            .into_iter()
-            .all(|team_name| scores.contains_key(team_name)));
+        assert!(
+            ["England", "France", "Germany", "Italy", "Poland", "Spain"]
+                .into_iter()
+                .all(|team_name| scores.contains_key(team_name))
+        );
     }
 
     #[test]

solutions/16_lifetimes/lifetimes1.rs

@@ -5,11 +5,7 @@
 
 fn longest<'a>(x: &'a str, y: &'a str) -> &'a str {
     //    ^^^^     ^^          ^^          ^^
-    if x.len() > y.len() {
-        x
-    } else {
-        y
-    }
+    if x.len() > y.len() { x } else { y }
 }
 
 fn main() {

solutions/16_lifetimes/lifetimes2.rs

@@ -1,9 +1,5 @@
 fn longest<'a>(x: &'a str, y: &'a str) -> &'a str {
-    if x.len() > y.len() {
-        x
-    } else {
-        y
-    }
+    if x.len() > y.len() { x } else { y }
 }
 
 fn main() {

solutions/quizzes/quiz2.rs

@@ -62,8 +62,8 @@ mod tests {
     // Import `transformer`.
     use super::my_module::transformer;
 
-    use super::my_module::transformer_iter;
     use super::Command;
+    use super::my_module::transformer_iter;
 
     #[test]
     fn it_works() {

src/dev/check.rs

@@ -313,7 +313,7 @@ fn check_solutions(
     fmt_cmd
         .arg("--check")
         .arg("--edition")
-        .arg("2021")
+        .arg("2024")
         .arg("--color")
         .arg("always")
         .stdin(Stdio::null());