From 7612538d619163efdd399d27ae7cea57864737e4 Mon Sep 17 00:00:00 2001
From: vasu <vasu.sharma314@gmail.com>
Date: Wed, 30 Dec 2020 23:55:31 +0100
Subject: [PATCH] Solutions: Part 2
---
exercises/enums/enums1.rs | 7 ++++---
exercises/enums/enums2.rs | 7 ++++---
exercises/enums/enums3.rs | 18 ++++++++++++++----
exercises/modules/modules1.rs | 4 +---
exercises/quiz3.rs | 6 ++----
exercises/tests/tests1.rs | 4 +---
exercises/tests/tests2.rs | 4 +---
exercises/tests/tests3.rs | 6 ++----
8 files changed, 29 insertions(+), 27 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..293980a 100644
--- a/exercises/enums/enums2.rs
+++ b/exercises/enums/enums2.rs
@@ -1,11 +1,12 @@
// 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..fbf771a 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,16 @@ impl State {
}
fn process(&mut self, message: Message) {
- // TODO: create a match expression to process the different message variants
+ match message {
+ Message::ChangeColor(color) => {
+ self.color = color;
+ },
+ Message::Echo(_) => {},
+ Message::Quit => {self.quit = true;},
+ Message::Move (position) => {
+ self.position = position;
+ },
+ }
}
}
diff --git a/exercises/modules/modules1.rs b/exercises/modules/modules1.rs
index 812dfee..3af7f48 100644
--- a/exercises/modules/modules1.rs
+++ b/exercises/modules/modules1.rs
@@ -1,10 +1,8 @@
// modules1.rs
// Make me compile! Execute `rustlings hint modules1` for hints :)
-// I AM NOT DONE
-
mod sausage_factory {
- fn make_sausage() {
+ pub fn make_sausage() {
println!("sausage!");
}
}
diff --git a/exercises/quiz3.rs b/exercises/quiz3.rs
index a0cd371..0bad189 100644
--- a/exercises/quiz3.rs
+++ b/exercises/quiz3.rs
@@ -7,8 +7,6 @@
// we expect to get when we call `times_two` with a negative number.
// No hints, you can do this :)
-// I AM NOT DONE
-
pub fn times_two(num: i32) -> i32 {
num * 2
}
@@ -19,11 +17,11 @@ mod tests {
#[test]
fn returns_twice_of_positive_numbers() {
- assert_eq!(times_two(4), ???);
+ assert_eq!(times_two(4), 8);
}
#[test]
fn returns_twice_of_negative_numbers() {
- // TODO write an assert for `times_two(-4)`
+ assert_eq!(times_two(-4), -8);
}
}
diff --git a/exercises/tests/tests1.rs b/exercises/tests/tests1.rs
index 50586a1..005731f 100644
--- a/exercises/tests/tests1.rs
+++ b/exercises/tests/tests1.rs
@@ -6,12 +6,10 @@
// This test has a problem with it -- make the test compile! Make the test
// pass! Make the test fail! Execute `rustlings hint tests1` for hints :)
-// I AM NOT DONE
-
#[cfg(test)]
mod tests {
#[test]
fn you_can_assert() {
- assert!();
+ assert!(true);
}
}
diff --git a/exercises/tests/tests2.rs b/exercises/tests/tests2.rs
index 0d981ad..58f66f3 100644
--- a/exercises/tests/tests2.rs
+++ b/exercises/tests/tests2.rs
@@ -2,12 +2,10 @@
// This test has a problem with it -- make the test compile! Make the test
// pass! Make the test fail! Execute `rustlings hint tests2` for hints :)
-// I AM NOT DONE
-
#[cfg(test)]
mod tests {
#[test]
fn you_can_assert_eq() {
- assert_eq!();
+ assert_eq!(2+2, 4);
}
}
diff --git a/exercises/tests/tests3.rs b/exercises/tests/tests3.rs
index 3424f94..6fcf427 100644
--- a/exercises/tests/tests3.rs
+++ b/exercises/tests/tests3.rs
@@ -4,8 +4,6 @@
// we expect to get when we call `is_even(5)`.
// Execute `rustlings hint tests3` for hints :)
-// I AM NOT DONE
-
pub fn is_even(num: i32) -> bool {
num % 2 == 0
}
@@ -16,11 +14,11 @@ mod tests {
#[test]
fn is_true_when_even() {
- assert!();
+ assert!(is_even(44));
}
#[test]
fn is_false_when_odd() {
- assert!();
+ assert!(!is_even(29));
}
}