Merge pull request #3 from 0xchasingfire/exercises-d2

enum and modules

exercises/enums/enums1.rs

@@ -1,11 +1,13 @@
 // enums1.rs
 // Make me compile! Execute `rustlings hint enums1` for hints!
 
-// I AM NOT DONE
-
 #[derive(Debug)]
 enum Message {
     // TODO: define a few types of messages as used below
+    Quit,
+    Echo,
+    Move,
+    ChangeColor,
 }
 
 fn main() {

exercises/enums/enums2.rs

@@ -1,11 +1,13 @@
 // enums2.rs
 // Make me compile! Execute `rustlings hint enums2` for hints!
 
-// I AM NOT DONE
-
 #[derive(Debug)]
 enum Message {
     // TODO: define the different variants used below
+    Move{x: i32, y: i32},
+    Echo(String),
+    ChangeColor(i32, i32, i32),
+    Quit,
 }
 
 impl Message {

exercises/enums/enums3.rs

@@ -1,10 +1,12 @@
 // enums3.rs
 // Address all the TODOs to make the tests pass!
 
-// I AM NOT DONE
-
 enum Message {
     // TODO: implement the message variant types based on their usage below
+    Move(Point),
+    Echo(String),
+    ChangeColor((u8, u8, u8)),
+    Quit,
 }
 
 struct Point {
@@ -37,6 +39,12 @@ impl State {
 
     fn process(&mut self, message: Message) {
         // TODO: create a match expression to process the different message variants
+        match message {
+            Message::ChangeColor(color) => self.change_color(color),
+            Message::Move(point) => self.move_position(point),
+            Message::Echo(string) => self.echo(string), 
+            Message::Quit => self.quit(),
+        }
     }
 }
 

exercises/modules/modules1.rs

@@ -1,10 +1,9 @@
 // modules1.rs
 // Make me compile! Execute `rustlings hint modules1` for hints :)
 
-// I AM NOT DONE
 
-mod sausage_factory {
+pub mod sausage_factory {
-    fn make_sausage() {
+    pub fn make_sausage() {
         println!("sausage!");
     }
 }

exercises/modules/modules2.rs

@@ -1,11 +1,9 @@
 // modules2.rs
 // Make me compile! Execute `rustlings hint modules2` for hints :)
 
-// I AM NOT DONE
+pub mod delicious_snacks {
-
+    pub use self::fruits::PEAR as fruit;
-mod delicious_snacks {
+    pub use self::veggies::CUCUMBER as veggie;
-    use self::fruits::PEAR as fruit;
-    use self::veggies::CUCUMBER as veggie;
 
     mod fruits {
         pub const PEAR: &'static str = "Pear";

exercises/move_semantics/move_semantics5.rs

@@ -2,13 +2,15 @@
 // Make me compile without adding any newlines or removing any of the lines.
 // Execute `rustlings hint move_semantics5` for hints :)
 
-// I AM NOT DONE
 
 fn main() {
     let mut x = 100;
-    let y = &mut x;
+    {
-    let z = &mut *y;
+        let y = &mut x;
-    *y += 100;
+        *y += 100;
+    }
+    let z = &mut x;
+    // *y += 100;
     *z += 1000;
     assert_eq!(x, 1200);
 }