summaryrefslogtreecommitdiff
path: root/exercises/08_enums/enums3.rs
diff options
context:
space:
mode:
Diffstat (limited to 'exercises/08_enums/enums3.rs')
-rw-r--r--exercises/08_enums/enums3.rs19
1 files changed, 9 insertions, 10 deletions
diff --git a/exercises/08_enums/enums3.rs b/exercises/08_enums/enums3.rs
index edac3df..7dd2171 100644
--- a/exercises/08_enums/enums3.rs
+++ b/exercises/08_enums/enums3.rs
@@ -1,7 +1,5 @@
-// Address all the TODOs to make the tests pass!
-
enum Message {
- // TODO: implement the message variant types based on their usage below
+ // TODO: Implement the message variant types based on their usage below.
}
struct Point {
@@ -26,17 +24,17 @@ impl State {
}
fn echo(&mut self, s: String) {
- self.message = s
+ self.message = s;
}
- fn move_position(&mut self, p: Point) {
- self.position = p;
+ fn move_position(&mut self, point: Point) {
+ self.position = point;
}
fn process(&mut self, message: Message) {
- // TODO: create a match expression to process the different message variants
+ // 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))
+ // e.g. `foo((t, u, p, l, e))`
}
}
@@ -54,8 +52,9 @@ mod tests {
quit: false,
position: Point { x: 0, y: 0 },
color: (0, 0, 0),
- message: "hello world".to_string(),
+ message: String::from("hello world"),
};
+
state.process(Message::ChangeColor(255, 0, 255));
state.process(Message::Echo(String::from("Hello world!")));
state.process(Message::Move(Point { x: 10, y: 15 }));
@@ -64,7 +63,7 @@ mod tests {
assert_eq!(state.color, (255, 0, 255));
assert_eq!(state.position.x, 10);
assert_eq!(state.position.y, 15);
- assert_eq!(state.quit, true);
+ assert!(state.quit);
assert_eq!(state.message, "Hello world!");
}
}