From 0b3e8d79f99749ca866b5de3e6201fc58f3c8145 Mon Sep 17 00:00:00 2001 From: liruifengv Date: Sat, 5 Nov 2022 16:06:35 +0800 Subject: [PATCH] enums --- exercises/enums/enums1.rs | 7 ++++--- exercises/enums/enums2.rs | 9 +++++++-- exercises/enums/enums3.rs | 14 ++++++++++---- exercises/quiz2.rs | 2 +- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/exercises/enums/enums1.rs b/exercises/enums/enums1.rs index 511ba740..ff7af009 100644 --- a/exercises/enums/enums1.rs +++ b/exercises/enums/enums1.rs @@ -1,11 +1,12 @@ // enums1.rs // No hints this time! ;) -// I AM NOT DONE - #[derive(Debug)] enum Message { - // TODO: define a few types of messages as used below + Quit, + Echo, + Move, + ChangeColor, } fn main() { diff --git a/exercises/enums/enums2.rs b/exercises/enums/enums2.rs index 18479f87..6c9b15fb 100644 --- a/exercises/enums/enums2.rs +++ b/exercises/enums/enums2.rs @@ -1,11 +1,16 @@ // enums2.rs // Execute `rustlings hint enums2` or use the `hint` watch subcommand for a hint. -// 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 { diff --git a/exercises/enums/enums3.rs b/exercises/enums/enums3.rs index 55acf6bc..b0394d1f 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,7 +38,12 @@ impl State { } fn process(&mut self, message: Message) { - // TODO: create a match expression to process the different message variants + match message { + Message::Echo(string) => println!("{}", string), + Message::Move(point) => self.position = point, + Message::ChangeColor(color) => self.color = color, + Message::Quit => self.quit = true, + } } } diff --git a/exercises/quiz2.rs b/exercises/quiz2.rs index a98b09b1..01cc4f60 100644 --- a/exercises/quiz2.rs +++ b/exercises/quiz2.rs @@ -33,7 +33,7 @@ mod my_module { Command::Uppercase => content.to_uppercase(), Command::Trim => content.trim().to_string(), Command::Append(n) => format!("{}{}", content, "bar".repeat(*n)) - } + } }).collect() } }