Merge pull request #492 from etiennebarrie/rustfmt-on-exercises

chore: Run rustfmt on exercises

exercises/conversions/from_str.rs

@@ -82,5 +82,4 @@ mod tests {
     fn missing_name_and_invalid_age() {
         ",one".parse::<Person>().unwrap();
     }
-
 }

exercises/conversions/try_from_into.rs

@@ -2,7 +2,7 @@
 // Basically, this is the same as From. The main difference is that this should return a Result type
 // instead of the target type itself.
 // You can read more about it at https://doc.rust-lang.org/std/convert/trait.TryFrom.html
-use std::convert::{TryInto, TryFrom};
+use std::convert::{TryFrom, TryInto};
 
 #[derive(Debug)]
 struct Color {

exercises/conversions/using_as.rs

@@ -7,9 +7,7 @@
 // I AM NOT DONE
 
 fn average(values: &[f64]) -> f64 {
-    let total = values
+    let total = values.iter().fold(0.0, |a, b| a + b);
-        .iter()
-        .fold(0.0, |a, b| a + b);
     total / values.len()
 }
 

exercises/enums/enums2.rs

@@ -16,10 +16,10 @@ impl Message {
 
 fn main() {
     let messages = [
-        Message::Move{ x: 10, y: 30 },
+        Message::Move { x: 10, y: 30 },
         Message::Echo(String::from("hello world")),
         Message::ChangeColor(200, 255, 255),
-        Message::Quit
+        Message::Quit,
     ];
 
     for message in &messages {

exercises/enums/enums3.rs

@@ -9,13 +9,13 @@ enum Message {
 
 struct Point {
     x: u8,
-    y: u8
+    y: u8,
 }
 
 struct State {
     color: (u8, u8, u8),
     position: Point,
-    quit: bool
+    quit: bool,
 }
 
 impl State {
@@ -46,14 +46,14 @@ mod tests {
 
     #[test]
     fn test_match_message_call() {
-        let mut state = State{
+        let mut state = State {
             quit: false,
-            position: Point{ x: 0, y: 0 },
+            position: Point { x: 0, y: 0 },
-            color: (0, 0, 0)
+            color: (0, 0, 0),
         };
         state.process(Message::ChangeColor((255, 0, 255)));
         state.process(Message::Echo(String::from("hello world")));
-        state.process(Message::Move(Point{ x: 10, y: 15 }));
+        state.process(Message::Move(Point { x: 10, y: 15 }));
         state.process(Message::Quit);
 
         assert_eq!(state.color, (255, 0, 255));
@@ -61,5 +61,4 @@ mod tests {
         assert_eq!(state.position.y, 15);
         assert_eq!(state.quit, true);
     }
-
 }

exercises/generics/generics1.rs

@@ -7,4 +7,3 @@ fn main() {
     let mut shopping_list: Vec<?> = Vec::new();
     shopping_list.push("milk");
 }
-

exercises/generics/generics2.rs

@@ -4,7 +4,7 @@
 // I AM NOT DONE
 
 struct Wrapper {
-    value: u32
+    value: u32,
 }
 
 impl Wrapper {

exercises/generics/generics3.rs

@@ -33,7 +33,10 @@ mod tests {
             student_name: "Tom Wriggle".to_string(),
             student_age: 12,
         };
-        assert_eq!(report_card.print(), "Tom Wriggle (12) - achieved a grade of 2.1");
+        assert_eq!(
+            report_card.print(),
+            "Tom Wriggle (12) - achieved a grade of 2.1"
+        );
     }
 
     #[test]
@@ -44,6 +47,9 @@ mod tests {
             student_name: "Gary Plotter".to_string(),
             student_age: 11,
         };
-        assert_eq!(report_card.print(), "Gary Plotter (11) - achieved a grade of A+");
+        assert_eq!(
+            report_card.print(),
+            "Gary Plotter (11) - achieved a grade of A+"
+        );
     }
 }

exercises/macros/macros4.rs

@@ -6,10 +6,10 @@
 macro_rules! my_macro {
     () => {
         println!("Check out my macro!");
-    }
+    };
     ($val:expr) => {
         println!("Look at this other macro: {}", $val);
-    }
+    };
 }
 
 fn main() {

exercises/standard_library_types/box1.rs

@@ -26,7 +26,10 @@ pub enum List {
 
 fn main() {
     println!("This is an empty cons list: {:?}", create_empty_list());
-    println!("This is a non-empty cons list: {:?}", create_non_empty_list());
+    println!(
+        "This is a non-empty cons list: {:?}",
+        create_non_empty_list()
+    );
 }
 
 pub fn create_empty_list() -> List {

exercises/structs/structs3.rs

@@ -17,7 +17,11 @@ impl Package {
         if weight_in_grams <= 0 {
             // Something goes here...
         } else {
-            return Package {sender_country, recipient_country, weight_in_grams};
+            return Package {
+                sender_country,
+                recipient_country,
+                weight_in_grams,
+            };
         }
     }
 

exercises/traits/traits2.rs

@@ -18,9 +18,6 @@ trait AppendBar {
 
 //TODO: Add your code here
 
-
-
-
 #[cfg(test)]
 mod tests {
     use super::*;