diff --git a/exercises/enums/enums2.rs b/exercises/enums/enums2.rs index 167a6b2e..05cc008f 100644 --- a/exercises/enums/enums2.rs +++ b/exercises/enums/enums2.rs @@ -6,6 +6,10 @@ #[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 { diff --git a/exercises/enums/enums3.rs b/exercises/enums/enums3.rs index a2a9d586..612bb9c8 100644 --- a/exercises/enums/enums3.rs +++ b/exercises/enums/enums3.rs @@ -2,10 +2,11 @@ // Address all the TODOs to make the tests pass! // Execute `rustlings hint enums3` or use the `hint` watch subcommand for a hint. -// 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,8 +38,13 @@ impl State { } fn process(&mut self, message: Message) { - // TODO: create a match expression to process the different message variants - // Remember: When passing a tuple as a function argument, you'll need extra parentheses: fn function((t, u, p, l, e)) + match message { + Message::Echo(s) => self.echo(s), + Message::Move(p) => self.move_position(p), + Message::ChangeColor(a, _, _) => self.change_color((a, 0, 255)), // Hardocded params + Message::Quit => self.quit(), + } + } } diff --git a/exercises/strings/strings1.rs b/exercises/strings/strings1.rs index 0de86a1d..d7c3714d 100644 --- a/exercises/strings/strings1.rs +++ b/exercises/strings/strings1.rs @@ -10,5 +10,6 @@ fn main() { } fn current_favorite_color() -> String { - "blue" + String::from("blue") + //"blue".to_string() }