From cb82bbc057fa540bd172d9f4722a347267a208fb Mon Sep 17 00:00:00 2001
From: Simon Halimi <halimisimon@gmail.com>
Date: Tue, 13 Apr 2021 16:19:05 +0200
Subject: [PATCH] add enums
---
exercises/enums/enums1.rs | 7 ++++---
exercises/enums/enums2.rs | 8 +++++---
exercises/enums/enums3.rs | 14 ++++++++++----
3 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/exercises/enums/enums1.rs b/exercises/enums/enums1.rs
index a2223d3..adf7f01 100644
--- a/exercises/enums/enums1.rs
+++ b/exercises/enums/enums1.rs
@@ -1,11 +1,12 @@
// 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() {
diff --git a/exercises/enums/enums2.rs b/exercises/enums/enums2.rs
index ec32d95..8373229 100644
--- a/exercises/enums/enums2.rs
+++ b/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 {
diff --git a/exercises/enums/enums3.rs b/exercises/enums/enums3.rs
index 178b40c..c2ed909 100644
--- a/exercises/enums/enums3.rs
+++ b/exercises/enums/enums3.rs
@@ -1,10 +1,11 @@
// 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 {
@@ -36,7 +37,12 @@ impl State {
}
fn process(&mut self, message: Message) {
- // TODO: create a match expression to process the different message variants
+ match message {
+ Message::ChangeColor(n) => self.change_color(n),
+ Message::Echo(n) => self.echo(n),
+ Message::Move(n) => self.move_position(n),
+ Message::Quit => self.quit(),
+ }
}
}