From 0a7eaaf9d026ff74ebe2f49703ac8893a2a62dfb Mon Sep 17 00:00:00 2001
From: Yuhua Mai <yuhua@urbandoor.com>
Date: Thu, 14 May 2020 23:26:31 -0700
Subject: [PATCH] More exercises
---
exercises/enums/enums1.rs | 5 ++++-
exercises/enums/enums2.rs | 5 ++++-
exercises/enums/enums3.rs | 11 +++++++++-
exercises/macros/macros1.rs | 3 +--
exercises/macros/macros2.rs | 9 ++++----
exercises/macros/macros3.rs | 2 +-
exercises/macros/macros4.rs | 3 +--
exercises/modules/modules1.rs | 3 +--
exercises/modules/modules2.rs | 5 ++---
exercises/move_semantics/move_semantics1.rs | 3 +--
exercises/move_semantics/move_semantics2.rs | 7 +++----
exercises/move_semantics/move_semantics3.rs | 3 +--
exercises/move_semantics/move_semantics4.rs | 7 +++----
exercises/primitive_types/primitive_types1.rs | 4 +---
exercises/primitive_types/primitive_types2.rs | 3 +--
exercises/primitive_types/primitive_types3.rs | 3 +--
exercises/primitive_types/primitive_types4.rs | 3 +--
exercises/primitive_types/primitive_types5.rs | 3 +--
exercises/primitive_types/primitive_types6.rs | 3 +--
exercises/strings/strings1.rs | 3 +--
exercises/strings/strings2.rs | 3 +--
exercises/structs/structs1.rs | 18 ++++++++--------
exercises/structs/structs2.rs | 7 +++++--
exercises/test1.rs | 5 +++--
exercises/test2.rs | 21 +++++++++----------
exercises/test3.rs | 4 ++--
exercises/test4.rs | 6 +++++-
exercises/tests/tests1.rs | 3 +--
exercises/tests/tests2.rs | 3 +--
exercises/tests/tests3.rs | 3 +--
30 files changed, 82 insertions(+), 79 deletions(-)
diff --git a/exercises/enums/enums1.rs b/exercises/enums/enums1.rs
index a2223d3..36d1267 100644
--- a/exercises/enums/enums1.rs
+++ b/exercises/enums/enums1.rs
@@ -1,11 +1,14 @@
// 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 52ccb22..3972f04 100644
--- a/exercises/enums/enums2.rs
+++ b/exercises/enums/enums2.rs
@@ -1,11 +1,14 @@
// 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 bb7dfb4..33c274f 100644
--- a/exercises/enums/enums3.rs
+++ b/exercises/enums/enums3.rs
@@ -1,10 +1,13 @@
// 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 {x: u8, y: u8},
+ Echo(String),
+ ChangeColor(u8, u8, u8),
+ Quit
}
struct Point {
@@ -37,6 +40,12 @@ impl State {
fn process(&mut self, message: Message) {
// TODO: create a match expression to process the different message variants
+ match message {
+ Message::ChangeColor(a,b,c) => self.change_color((a,b,c)),
+ Message::Echo(s) => self.echo(s),
+ Message::Move {x, y} => self.move_position(Point {x, y}),
+ Message::Quit => self.quit()
+ }
}
}
diff --git a/exercises/macros/macros1.rs b/exercises/macros/macros1.rs
index ed0dac8..6f812d0 100644
--- a/exercises/macros/macros1.rs
+++ b/exercises/macros/macros1.rs
@@ -1,7 +1,6 @@
// macros1.rs
// Make me compile! Execute `rustlings hint macros1` for hints :)
-// I AM NOT DONE
macro_rules! my_macro {
() => {
@@ -10,5 +9,5 @@ macro_rules! my_macro {
}
fn main() {
- my_macro();
+ my_macro!();
}
diff --git a/exercises/macros/macros2.rs b/exercises/macros/macros2.rs
index d0be123..9d91479 100644
--- a/exercises/macros/macros2.rs
+++ b/exercises/macros/macros2.rs
@@ -1,14 +1,15 @@
// macros2.rs
// Make me compile! Execute `rustlings hint macros2` for hints :)
-// I AM NOT DONE
-fn main() {
- my_macro!();
-}
+
macro_rules! my_macro {
() => {
println!("Check out my macro!");
};
}
+
+fn main() {
+ my_macro!();
+}
\ No newline at end of file
diff --git a/exercises/macros/macros3.rs b/exercises/macros/macros3.rs
index 93a4311..c1ee00d 100644
--- a/exercises/macros/macros3.rs
+++ b/exercises/macros/macros3.rs
@@ -2,8 +2,8 @@
// Make me compile, without taking the macro out of the module!
// Execute `rustlings hint macros3` for hints :)
-// I AM NOT DONE
+#[macro_use]
mod macros {
macro_rules! my_macro {
() => {
diff --git a/exercises/macros/macros4.rs b/exercises/macros/macros4.rs
index 3a74807..066048e 100644
--- a/exercises/macros/macros4.rs
+++ b/exercises/macros/macros4.rs
@@ -1,12 +1,11 @@
// macros4.rs
// Make me compile! Execute `rustlings hint macros4` for hints :)
-// I AM NOT DONE
macro_rules! my_macro {
() => {
println!("Check out my macro!");
- }
+ };
($val:expr) => {
println!("Look at this other macro: {}", $val);
}
diff --git a/exercises/modules/modules1.rs b/exercises/modules/modules1.rs
index 812dfee..c76b058 100644
--- a/exercises/modules/modules1.rs
+++ b/exercises/modules/modules1.rs
@@ -1,10 +1,9 @@
// 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/modules/modules2.rs b/exercises/modules/modules2.rs
index fde439d..00bb1a2 100644
--- a/exercises/modules/modules2.rs
+++ b/exercises/modules/modules2.rs
@@ -1,11 +1,10 @@
// modules2.rs
// Make me compile! Execute `rustlings hint modules2` for hints :)
-// I AM NOT DONE
mod delicious_snacks {
- use self::fruits::PEAR as fruit;
- use self::veggies::CUCUMBER as veggie;
+ pub use self::fruits::PEAR as fruit;
+ pub use self::veggies::CUCUMBER as veggie;
mod fruits {
pub const PEAR: &'static str = "Pear";
diff --git a/exercises/move_semantics/move_semantics1.rs b/exercises/move_semantics/move_semantics1.rs
index e2f5876..78e4f8a 100644
--- a/exercises/move_semantics/move_semantics1.rs
+++ b/exercises/move_semantics/move_semantics1.rs
@@ -1,12 +1,11 @@
// move_semantics1.rs
// Make me compile! Execute `rustlings hint move_semantics1` for hints :)
-// I AM NOT DONE
fn main() {
let vec0 = Vec::new();
- let vec1 = fill_vec(vec0);
+ let mut vec1 = fill_vec(vec0);
println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
diff --git a/exercises/move_semantics/move_semantics2.rs b/exercises/move_semantics/move_semantics2.rs
index bd21fbb..9d0a25a 100644
--- a/exercises/move_semantics/move_semantics2.rs
+++ b/exercises/move_semantics/move_semantics2.rs
@@ -2,12 +2,11 @@
// Make me compile without changing line 13!
// Execute `rustlings hint move_semantics2` for hints :)
-// I AM NOT DONE
fn main() {
let vec0 = Vec::new();
- let mut vec1 = fill_vec(vec0);
+ let mut vec1 = fill_vec(&vec0);
// Do not change the following line!
println!("{} has length {} content `{:?}`", "vec0", vec0.len(), vec0);
@@ -17,8 +16,8 @@ fn main() {
println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
}
-fn fill_vec(vec: Vec<i32>) -> Vec<i32> {
- let mut vec = vec;
+fn fill_vec(vec: &Vec<i32>) -> Vec<i32> {
+ let mut vec = vec.to_vec();
vec.push(22);
vec.push(44);
diff --git a/exercises/move_semantics/move_semantics3.rs b/exercises/move_semantics/move_semantics3.rs
index 43fef74..38ae109 100644
--- a/exercises/move_semantics/move_semantics3.rs
+++ b/exercises/move_semantics/move_semantics3.rs
@@ -3,7 +3,6 @@
// (no lines with multiple semicolons necessary!)
// Execute `rustlings hint move_semantics3` for hints :)
-// I AM NOT DONE
fn main() {
let vec0 = Vec::new();
@@ -17,7 +16,7 @@ fn main() {
println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
}
-fn fill_vec(vec: Vec<i32>) -> Vec<i32> {
+fn fill_vec(mut vec: Vec<i32>) -> Vec<i32> {
vec.push(22);
vec.push(44);
vec.push(66);
diff --git a/exercises/move_semantics/move_semantics4.rs b/exercises/move_semantics/move_semantics4.rs
index a1c4a41..ac90380 100644
--- a/exercises/move_semantics/move_semantics4.rs
+++ b/exercises/move_semantics/move_semantics4.rs
@@ -4,12 +4,11 @@
// freshly created vector from fill_vec to its caller.
// Execute `rustlings hint move_semantics4` for hints!
-// I AM NOT DONE
fn main() {
- let vec0 = Vec::new();
+ // let vec0 = Vec::new();
- let mut vec1 = fill_vec(vec0);
+ let mut vec1 = fill_vec();
println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
@@ -20,7 +19,7 @@ fn main() {
// `fill_vec()` no longer take `vec: Vec<i32>` as argument
fn fill_vec() -> Vec<i32> {
- let mut vec = vec;
+ let mut vec = Vec::new();
vec.push(22);
vec.push(44);
diff --git a/exercises/primitive_types/primitive_types1.rs b/exercises/primitive_types/primitive_types1.rs
index 0912139..18bd819 100644
--- a/exercises/primitive_types/primitive_types1.rs
+++ b/exercises/primitive_types/primitive_types1.rs
@@ -2,8 +2,6 @@
// Fill in the rest of the line that has code missing!
// No hints, there's no tricks, just get used to typing these :)
-// I AM NOT DONE
-
fn main() {
// Booleans (`bool`)
@@ -12,7 +10,7 @@ fn main() {
println!("Good morning!");
}
- let // Finish the rest of this line like the example! Or make it be false!
+ let is_evening = true; // Finish the rest of this line like the example! Or make it be false!
if is_evening {
println!("Good evening!");
}
diff --git a/exercises/primitive_types/primitive_types2.rs b/exercises/primitive_types/primitive_types2.rs
index 6576a4d..85acfe4 100644
--- a/exercises/primitive_types/primitive_types2.rs
+++ b/exercises/primitive_types/primitive_types2.rs
@@ -2,7 +2,6 @@
// Fill in the rest of the line that has code missing!
// No hints, there's no tricks, just get used to typing these :)
-// I AM NOT DONE
fn main() {
// Characters (`char`)
@@ -16,7 +15,7 @@ fn main() {
println!("Neither alphabetic nor numeric!");
}
- let // Finish this line like the example! What's your favorite character?
+ let your_character = '1'; // Finish this line like the example! What's your favorite character?
// Try a letter, try a number, try a special character, try a character
// from a different language than your own, try an emoji!
if your_character.is_alphabetic() {
diff --git a/exercises/primitive_types/primitive_types3.rs b/exercises/primitive_types/primitive_types3.rs
index dfd6351..9afd52e 100644
--- a/exercises/primitive_types/primitive_types3.rs
+++ b/exercises/primitive_types/primitive_types3.rs
@@ -2,10 +2,9 @@
// Create an array with at least 100 elements in it where the ??? is.
// Execute `rustlings hint primitive_types3` for hints!
-// I AM NOT DONE
fn main() {
- let a = ???
+ let a = [0; 200];
if a.len() >= 100 {
println!("Wow, that's a big array!");
diff --git a/exercises/primitive_types/primitive_types4.rs b/exercises/primitive_types/primitive_types4.rs
index 10b553e..bf8fc2d 100644
--- a/exercises/primitive_types/primitive_types4.rs
+++ b/exercises/primitive_types/primitive_types4.rs
@@ -2,13 +2,12 @@
// Get a slice out of Array a where the ??? is so that the test passes.
// Execute `rustlings hint primitive_types4` for hints!!
-// I AM NOT DONE
#[test]
fn slice_out_of_array() {
let a = [1, 2, 3, 4, 5];
- let nice_slice = ???
+ let nice_slice = &a[1..=3];
assert_eq!([2, 3, 4], nice_slice)
}
diff --git a/exercises/primitive_types/primitive_types5.rs b/exercises/primitive_types/primitive_types5.rs
index 680d8d2..dc57315 100644
--- a/exercises/primitive_types/primitive_types5.rs
+++ b/exercises/primitive_types/primitive_types5.rs
@@ -2,11 +2,10 @@
// Destructure the `cat` tuple so that the println will work.
// Execute `rustlings hint primitive_types5` for hints!
-// I AM NOT DONE
fn main() {
let cat = ("Furry McFurson", 3.5);
- let /* your pattern here */ = cat;
+ let (name, age) = cat;
println!("{} is {} years old.", name, age);
}
diff --git a/exercises/primitive_types/primitive_types6.rs b/exercises/primitive_types/primitive_types6.rs
index 2bc817e..92296b5 100644
--- a/exercises/primitive_types/primitive_types6.rs
+++ b/exercises/primitive_types/primitive_types6.rs
@@ -3,9 +3,8 @@
// You can put this right into the `println!` where the ??? is.
// Execute `rustlings hint primitive_types6` for hints!
-// I AM NOT DONE
fn main() {
let numbers = (1, 2, 3);
- println!("The second number is {}", ???);
+ println!("The second number is {}", numbers.1)
}
diff --git a/exercises/strings/strings1.rs b/exercises/strings/strings1.rs
index 8090244..aff1a4a 100644
--- a/exercises/strings/strings1.rs
+++ b/exercises/strings/strings1.rs
@@ -2,7 +2,6 @@
// Make me compile without changing the function signature!
// Execute `rustlings hint strings1` for hints ;)
-// I AM NOT DONE
fn main() {
let answer = current_favorite_color();
@@ -10,5 +9,5 @@ fn main() {
}
fn current_favorite_color() -> String {
- "blue"
+ "blue".to_string()
}
diff --git a/exercises/strings/strings2.rs b/exercises/strings/strings2.rs
index 5a2ce74..4200f69 100644
--- a/exercises/strings/strings2.rs
+++ b/exercises/strings/strings2.rs
@@ -2,11 +2,10 @@
// Make me compile without changing the function signature!
// Execute `rustlings hint strings2` for hints :)
-// I AM NOT DONE
fn main() {
let word = String::from("green"); // Try not changing this line :)
- if is_a_color_word(word) {
+ if is_a_color_word(&word) {
println!("That is a color word I know!");
} else {
println!("That is not a color word I know.");
diff --git a/exercises/structs/structs1.rs b/exercises/structs/structs1.rs
index 6d0b2f4..b70b37d 100644
--- a/exercises/structs/structs1.rs
+++ b/exercises/structs/structs1.rs
@@ -1,13 +1,13 @@
// structs1.rs
// Address all the TODOs to make the tests pass!
-// I AM NOT DONE
struct ColorClassicStruct {
- // TODO: Something goes here
+ name: String,
+ hex: String
}
-struct ColorTupleStruct(/* TODO: Something goes here */);
+struct ColorTupleStruct(String, String);
#[derive(Debug)]
struct UnitStruct;
@@ -18,8 +18,10 @@ mod tests {
#[test]
fn classic_c_structs() {
- // TODO: Instantiate a classic c struct!
- // let green =
+ let green = ColorClassicStruct {
+ name: "green".to_string(),
+ hex: "#00FF00".to_string()
+ };
assert_eq!(green.name, "green");
assert_eq!(green.hex, "#00FF00");
@@ -27,8 +29,7 @@ mod tests {
#[test]
fn tuple_structs() {
- // TODO: Instantiate a tuple struct!
- // let green =
+ let green = ColorTupleStruct("green".to_string(), "#00FF00".to_string());
assert_eq!(green.0, "green");
assert_eq!(green.1, "#00FF00");
@@ -36,8 +37,7 @@ mod tests {
#[test]
fn unit_structs() {
- // TODO: Instantiate a unit struct!
- // let unit_struct =
+ let unit_struct = UnitStruct;
let message = format!("{:?}s are fun!", unit_struct);
assert_eq!(message, "UnitStructs are fun!");
diff --git a/exercises/structs/structs2.rs b/exercises/structs/structs2.rs
index 0699137..f8530be 100644
--- a/exercises/structs/structs2.rs
+++ b/exercises/structs/structs2.rs
@@ -2,7 +2,6 @@
// Address all the TODOs to make the tests pass!
// No hints, just do it!
-// I AM NOT DONE
#[derive(Debug)]
struct Order {
@@ -35,7 +34,11 @@ mod tests {
fn your_order() {
let order_template = create_order_template();
// TODO: Create your own order using the update syntax and template above!
- // let your_order =
+ let your_order = Order {
+ name: "Hacker in Rust".to_string(),
+ count: 1,
+ ..order_template
+ };
assert_eq!(your_order.name, "Hacker in Rust");
assert_eq!(your_order.year, order_template.year);
assert_eq!(your_order.made_by_phone, order_template.made_by_phone);
diff --git a/exercises/test1.rs b/exercises/test1.rs
index 8b5b8fd..fe51bcd 100644
--- a/exercises/test1.rs
+++ b/exercises/test1.rs
@@ -7,10 +7,11 @@
// more than 40 at once, each apple only costs 1! Write a function that calculates
// the price of an order of apples given the order amount. No hints this time!
-// I AM NOT DONE
// Put your function here!
-// fn ..... {
+fn calculate_apple_price(amount: i32) -> i32 {
+ if amount > 40 { amount } else { amount * 2 }
+}
// Don't modify this function!
#[test]
diff --git a/exercises/test2.rs b/exercises/test2.rs
index d01606c..60548f8 100644
--- a/exercises/test2.rs
+++ b/exercises/test2.rs
@@ -7,7 +7,6 @@
// you think each value is. That is, add either `string_slice` or `string`
// before the parentheses on each line. If you're right, it will compile!
-// I AM NOT DONE
fn string_slice(arg: &str) {
println!("{}", arg);
@@ -17,14 +16,14 @@ fn string(arg: String) {
}
fn main() {
- ("blue");
- ("red".to_string());
- (String::from("hi"));
- ("rust is fun!".to_owned());
- ("nice weather".into());
- (format!("Interpolation {}", "Station"));
- (&String::from("abc")[0..1]);
- (" hello there ".trim());
- ("Happy Monday!".to_string().replace("Mon", "Tues"));
- ("mY sHiFt KeY iS sTiCkY".to_lowercase());
+ string_slice("blue");
+ string("red".to_string());
+ string(String::from("hi"));
+ string("rust is fun!".to_owned());
+ string("nice weather".into());
+ string(format!("Interpolation {}", "Station"));
+ string_slice(&String::from("abc")[0..1]);
+ string_slice(" hello there ".trim());
+ string("Happy Monday!".to_string().replace("Mon", "Tues"));
+ string("mY sHiFt KeY iS sTiCkY".to_lowercase());
}
diff --git a/exercises/test3.rs b/exercises/test3.rs
index f94c36f..846cef4 100644
--- a/exercises/test3.rs
+++ b/exercises/test3.rs
@@ -7,7 +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 +18,12 @@ 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/test4.rs b/exercises/test4.rs
index ad1f6ac..950573c 100644
--- a/exercises/test4.rs
+++ b/exercises/test4.rs
@@ -4,8 +4,12 @@
// - Macros
// Write a macro that passes the test! No hints this time, you can do it!
+macro_rules! my_macro {
+ ($val:expr) => {
+ format!("Hello {}", $val)
+ }
+}
-// I AM NOT DONE
#[cfg(test)]
mod tests {
diff --git a/exercises/tests/tests1.rs b/exercises/tests/tests1.rs
index 50586a1..955f423 100644
--- a/exercises/tests/tests1.rs
+++ b/exercises/tests/tests1.rs
@@ -6,12 +6,11 @@
// 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..b5e1351 100644
--- a/exercises/tests/tests2.rs
+++ b/exercises/tests/tests2.rs
@@ -2,12 +2,11 @@
// 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!(1, 1 + 0);
}
}
diff --git a/exercises/tests/tests3.rs b/exercises/tests/tests3.rs
index 693b8aa..372a32d 100644
--- a/exercises/tests/tests3.rs
+++ b/exercises/tests/tests3.rs
@@ -4,7 +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,6 +15,6 @@ mod tests {
#[test]
fn is_true_when_even() {
- assert!();
+ assert!(is_even(18));
}
}