From 2c461ef23a1f596539d3fba4e03ca2ede03c92fe Mon Sep 17 00:00:00 2001
From: seth <yesifan66@qq.com>
Date: Mon, 21 Jun 2021 15:36:29 +0800
Subject: [PATCH] complete: enums
---
exercises/enums/enums1.rs | 7 +++++--
exercises/enums/enums2.rs | 6 ++++--
exercises/enums/enums3.rs | 12 ++++++++++--
zsh-syntax-highlighting | 1 +
4 files changed, 20 insertions(+), 6 deletions(-)
create mode 160000 zsh-syntax-highlighting
diff --git a/exercises/enums/enums1.rs b/exercises/enums/enums1.rs
index a2223d3..60d1d17 100644
--- a/exercises/enums/enums1.rs
+++ b/exercises/enums/enums1.rs
@@ -1,13 +1,16 @@
// 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() {
println!("{:?}", Message::Quit);
println!("{:?}", Message::Echo);
diff --git a/exercises/enums/enums2.rs b/exercises/enums/enums2.rs
index ec32d95..2313905 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
+ Quit,
+ Move{ x: i32, y: i32 },
+ Echo(String),
+ ChangeColor(u32,u32,u32)
}
impl Message {
diff --git a/exercises/enums/enums3.rs b/exercises/enums/enums3.rs
index 178b40c..7323528 100644
--- a/exercises/enums/enums3.rs
+++ b/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
+ Quit,
+ Move(Point),
+ Echo(String),
+ ChangeColor((u8, u8, u8))
}
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::Quit => self.quit(),
+ Message::Move(p) => self.move_position(p),
+ Message::Echo(s) => self.echo(s),
+ Message::ChangeColor(c) => self.change_color(c),
+ };
}
}
diff --git a/zsh-syntax-highlighting b/zsh-syntax-highlighting
new file mode 160000
index 0000000..0e1bb14
--- /dev/null
+++ b/zsh-syntax-highlighting
@@ -0,0 +1 @@
+Subproject commit 0e1bb14452e3fc66dcc81531212e1061e02c1a61