format example solutions with edition 2024 (#2057)

Author: senekor

bin/format_exercises.sh

@@ -19,7 +19,7 @@ format_one_exercise() {
     cargo fmt
     file_name=".meta/$source_file_name.rs"
     if [ -f "$file_name" ]; then
-        rustfmt "$file_name"
+        rustfmt --edition 2024 "$file_name"
     fi
 }
 

exercises/concept/resistor-color/.meta/exemplar.rs

@@ -1,4 +1,4 @@
-use enum_iterator::{all, Sequence};
+use enum_iterator::{Sequence, all};
 use int_enum::IntEnum;
 
 #[repr(usize)]

exercises/concept/rpn-calculator/.meta/exemplar.rs

@@ -39,9 +39,5 @@ pub fn evaluate(inputs: &[CalculatorInput]) -> Option<i32> {
     }
 
     let output = stack.pop();
-    if stack.is_empty() {
-        output
-    } else {
-        None
-    }
+    if stack.is_empty() { output } else { None }
 }

exercises/practice/robot-name/.meta/example.rs

@@ -3,7 +3,7 @@ use std::{
     sync::{LazyLock, Mutex},
 };
 
-use rand::{thread_rng, Rng};
+use rand::{Rng, thread_rng};
 
 static NAMES: LazyLock<Mutex<HashSet<String>>> = LazyLock::new(|| Mutex::new(HashSet::new()));
 

exercises/practice/triangle/.meta/example.rs

@@ -25,11 +25,7 @@ where
     pub fn build(sides: [T; 3]) -> Option<Triangle<T>> {
         let t = Triangle { sides };
 
-        if t.valid_sides() {
-            Some(t)
-        } else {
-            None
-        }
+        if t.valid_sides() { Some(t) } else { None }
     }
 
     pub fn is_equilateral(&self) -> bool {

exercises/practice/wordy/.meta/example.rs

@@ -22,7 +22,11 @@ fn apply_op<'a, 'b>(num1: i32, words: &'a [Token<'b>]) -> Option<(i32, &'a [Toke
         [Token::NonNumber("minus")] => Some(num1 - num2),
         [Token::NonNumber("multiplied"), Token::NonNumber("by")] => Some(num1 * num2),
         [Token::NonNumber("divided"), Token::NonNumber("by")] => Some(num1 / num2),
-        [Token::NonNumber("raised"), Token::NonNumber("to"), Token::NonNumber("the")] => {
+        [
+            Token::NonNumber("raised"),
+            Token::NonNumber("to"),
+            Token::NonNumber("the"),
+        ] => {
             if Some(&Token::NonNumber("power")) == remainder.first() {
                 remainder = remainder.get(1..)?;
                 Some(num1.pow(num2 as u32))
@@ -56,7 +60,11 @@ pub fn answer(c: &str) -> Option<i32> {
         return None;
     }
     let mut result: i32 = match words[0..3] {
-        [Token::NonNumber("What"), Token::NonNumber("is"), Token::Number(i)] => i,
+        [
+            Token::NonNumber("What"),
+            Token::NonNumber("is"),
+            Token::Number(i),
+        ] => i,
         _ => return None,
     };
     let mut words = words.split_at(3).1;

exercises/practice/yacht/.meta/example.rs

@@ -71,11 +71,7 @@ fn get_straight(dice: Dice, straight_type: char) -> u8 {
     }
     let index: usize = if straight_type == 'l' { 5 } else { 0 };
 
-    if scores[index] == 0 {
-        30
-    } else {
-        0
-    }
+    if scores[index] == 0 { 30 } else { 0 }
 }
 
 fn get_yacht(dice: Dice) -> u8 {