feat(options): completed options

Cargo.lock

@@ -167,6 +167,10 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
+[[package]]
+name = "exercises"
+version = "0.0.0"
+
 [[package]]
 name = "fastrand"
 version = "2.4.1"

Cargo.toml

@@ -1,7 +1,10 @@
 [workspace]
+members = [
+  "rustlings-macros",
+  "dev",
+]
 exclude = [
   "tests/test_exercises",
-  "dev",
 ]
 
 [workspace.package]

exercises/02_functions/functions4.rs

@@ -8,7 +8,7 @@ fn is_even(num: i64) -> bool {
 }
 
 // TODO: Fix the function signature.
-fn sale_price(price: i64) -> {
+fn sale_price(price: i64) -> i64 {
     if is_even(price) {
         price - 10
     } else {

exercises/02_functions/functions5.rs

@@ -1,6 +1,6 @@
 // TODO: Fix the function body without changing the signature.
 fn square(num: i32) -> i32 {
-    num * num;
+    num * num
 }
 
 fn main() {

exercises/03_if/if1.rs

@@ -4,6 +4,11 @@ fn bigger(a: i32, b: i32) -> i32 {
     // Do not use:
     // - another function call
     // - additional variables
+    if a > b {
+        a
+    } else {
+        b
+    }
 }
 
 fn main() {

exercises/03_if/if2.rs

@@ -2,8 +2,10 @@
 fn picky_eater(food: &str) -> &str {
     if food == "strawberry" {
         "Yummy!"
+    } else if food == "potato" {
+        "I guess I can eat that."
     } else {
-        1
+        "No thanks!"
     }
 }
 

exercises/03_if/if3.rs

@@ -3,11 +3,11 @@ fn animal_habitat(animal: &str) -> &str {
     let identifier = if animal == "crab" {
         1
     } else if animal == "gopher" {
-        2.0
+        2
     } else if animal == "snake" {
         3
     } else {
-        "Unknown"
+        0
     };
 
     // Don't change the expression below!

exercises/04_primitive_types/primitive_types1.rs

@@ -8,7 +8,8 @@ fn main() {
 
     // TODO: Define a boolean variable with the name `is_evening` before the `if` statement below.
     // The value of the variable should be the negation (opposite) of `is_morning`.
-    // let …
+    let is_evening = true;
+
     if is_evening {
         println!("Good evening!");
     }

exercises/04_primitive_types/primitive_types2.rs

@@ -17,6 +17,7 @@ fn main() {
     // Try a letter, try a digit (in single quotes), try a special character, try a character
     // from a different language than your own, try an emoji 😉
     // let your_character = '';
+    let your_character = '僕';
 
     if your_character.is_alphabetic() {
         println!("Alphabetical!");

exercises/04_primitive_types/primitive_types3.rs

@@ -2,6 +2,14 @@ fn main() {
     // TODO: Create an array called `a` with at least 100 elements in it.
     // let a = ???
 
+    let a = [
+        1, 2, 3, 4, 5, 6, 7, 1, 231, 234, 11, 4512, 51, 5, 12, 51, 25, 12, 45, 134, 12, 412, 45,
+        12, 512, 512, 5, 12, 512, 4, 124, 12, 5, 125, 123, 3412, 45, 123, 5123, 5, 12345, 123, 412,
+        56, 1236, 234, 6345, 6534, 6, 547, 456, 754, 6, 345, 34, 534, 6, 235, 123, 4523, 4523, 5,
+        235, 235, 2, 532, 523, 23, 124, 21, 2, 3, 51235, 664, 3466, 345,312,312,421,412,45,1245,123,423,523,56,234,5234,5234,5,346,345,6745,7456,7456,7,456,7456,7,4, 2, 6, 23, 12, 4512, 512,
+        5, 512, 5, 125, 125, 125, 12, 56, 75, 7456, 87,
+    ];
+
     if a.len() >= 100 {
         println!("Wow, that's a big array!");
     } else {

exercises/04_primitive_types/primitive_types4.rs

@@ -11,6 +11,7 @@ mod tests {
         // TODO: Get a slice called `nice_slice` out of the array `a` so that the test passes.
         // let nice_slice = ???
 
+        let nice_slice = &a[1..4];
         assert_eq!([2, 3, 4], nice_slice);
     }
 }

exercises/04_primitive_types/primitive_types5.rs

@@ -4,5 +4,7 @@ fn main() {
     // TODO: Destructure the `cat` tuple in one statement so that the println works.
     // let /* your pattern here */ = cat;
 
+    let (name, age) = cat;
+
     println!("{name} is {age} years old");
 }

exercises/04_primitive_types/primitive_types6.rs

@@ -4,6 +4,7 @@ fn main() {
 
 #[cfg(test)]
 mod tests {
+
     #[test]
     fn indexing_tuple() {
         let numbers = (1, 2, 3);
@@ -11,6 +12,7 @@ mod tests {
         // TODO: Use a tuple index to access the second element of `numbers`
         // and assign it to a variable called `second`.
         // let second = ???;
+        let second = numbers.1;
 
         assert_eq!(second, 2, "This is not the 2nd number in the tuple!");
     }

exercises/05_vecs/vecs1.rs

@@ -1,6 +1,8 @@
 fn elems_to_vec(a: i32, b: i32, c: i32) -> Vec<i32> {
     // TODO: Return a vector containing the elements a, b and c (in this order).
     // Use the "vec!" macro.
+    let vector: Vec<i32> = vec![a, b, c];
+    vector
 }
 
 fn main() {

exercises/05_vecs/vecs2.rs

@@ -4,6 +4,8 @@ fn vec_loop(input: &[i32]) -> Vec<i32> {
     for element in input {
         // TODO: Multiply each element in the `input` slice by 2 and push it to
         // the `output` vector.
+
+        output.push(element * 2);
     }
 
     output

exercises/06_move_semantics/move_semantics1.rs

@@ -1,6 +1,6 @@
 // TODO: Fix the compiler error in this function.
 fn fill_vec(vec: Vec<i32>) -> Vec<i32> {
-    let vec = vec;
+    let mut vec = vec;
 
     vec.push(88);
 

exercises/06_move_semantics/move_semantics2.rs

@@ -20,7 +20,7 @@ mod tests {
     fn move_semantics2() {
         let vec0 = vec![22, 44, 66];
 
-        let vec1 = fill_vec(vec0);
+        let vec1 = fill_vec(vec0.clone());
 
         assert_eq!(vec0, [22, 44, 66]);
         assert_eq!(vec1, [22, 44, 66, 88]);

exercises/06_move_semantics/move_semantics3.rs

@@ -1,5 +1,5 @@
 // TODO: Fix the compiler error in the function without adding any new line.
-fn fill_vec(vec: Vec<i32>) -> Vec<i32> {
+fn fill_vec(mut vec: Vec<i32>) -> Vec<i32> {
     vec.push(88);
 
     vec

exercises/06_move_semantics/move_semantics4.rs

@@ -10,8 +10,8 @@ mod tests {
     fn move_semantics4() {
         let mut x = Vec::new();
         let y = &mut x;
-        let z = &mut x;
         y.push(42);
+        let z = &mut x;
         z.push(13);
         assert_eq!(x, [42, 13]);
     }

exercises/06_move_semantics/move_semantics5.rs

@@ -4,12 +4,12 @@
 // removing references (the character `&`).
 
 // Shouldn't take ownership
-fn get_char(data: String) -> char {
+fn get_char(data: &String) -> char {
     data.chars().last().unwrap()
 }
 
 // Should take ownership
-fn string_uppercase(mut data: &String) {
+fn string_uppercase(mut data: String) {
     data = data.to_uppercase();
 
     println!("{data}");
@@ -18,7 +18,7 @@ fn string_uppercase(mut data: &String) {
 fn main() {
     let data = "Rust is great!".to_string();
 
-    get_char(data);
+    get_char(&data);
 
-    string_uppercase(&data);
+    string_uppercase(data);
 }

exercises/07_structs/structs1.rs

@@ -1,9 +1,12 @@
 struct ColorRegularStruct {
     // TODO: Add the fields that the test `regular_structs` expects.
     // What types should the fields have? What are the minimum and maximum values for RGB colors?
+    red: u8,
+    green: u8,
+    blue: u8,
 }
 
-struct ColorTupleStruct(/* TODO: Add the fields that the test `tuple_structs` expects */);
+struct ColorTupleStruct(u8, u8, u8);
 
 #[derive(Debug)]
 struct UnitStruct;
@@ -20,7 +23,11 @@ mod tests {
     fn regular_structs() {
         // TODO: Instantiate a regular struct.
         // let green =
-
+        let green = ColorRegularStruct {
+            red: 0,
+            green: 255,
+            blue: 0,
+        };
         assert_eq!(green.red, 0);
         assert_eq!(green.green, 255);
         assert_eq!(green.blue, 0);
@@ -30,7 +37,7 @@ mod tests {
     fn tuple_structs() {
         // TODO: Instantiate a tuple struct.
         // let green =
-
+        let green = ColorTupleStruct(0, 255, 0);
         assert_eq!(green.0, 0);
         assert_eq!(green.1, 255);
         assert_eq!(green.2, 0);
@@ -39,7 +46,7 @@ mod tests {
     #[test]
     fn unit_structs() {
         // TODO: Instantiate a unit struct.
-        // let unit_struct =
+        let unit_struct = UnitStruct;
         let message = format!("{unit_struct:?}s are fun!");
 
         assert_eq!(message, "UnitStructs are fun!");

exercises/07_structs/structs2.rs

@@ -36,6 +36,12 @@ mod tests {
         // 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);

exercises/07_structs/structs3.rs

@@ -10,19 +10,18 @@ struct Fireworks {
     rockets: usize,
 }
 
-// TODO: Turn this function into an associated function on `Fireworks`.
+impl Fireworks {
-fn new_fireworks() -> Fireworks {
+    fn new() -> Self {
-    Fireworks { rockets: 0 }
+        Self { rockets: 0 }
-}
+    }
 
-// TODO: Turn this function into a method on `Fireworks`.
+    fn add_rockets(&mut self, rockets: usize) {
-fn add_rockets(fireworks: &mut Fireworks, rockets: usize) {
+        self.rockets += rockets
-    fireworks.rockets += rockets
+    }
-}
 
-// TODO: Turn this function into a method on `Fireworks`.
+    fn start(self) -> String {
-fn start(fireworks: Fireworks) -> String {
+        "🚀".repeat(self.rockets)
-    "🚀".repeat(fireworks.rockets)
+    }
 }
 
 fn main() {

exercises/08_enums/enums1.rs

@@ -1,6 +1,11 @@
 #[derive(Debug)]
 enum Message {
     // TODO: Define a few types of messages as used below.
+    Resize,
+    Move,
+    Echo,
+    ChangeColor,
+    Quit,
 }
 
 fn main() {

exercises/08_enums/enums2.rs

@@ -7,6 +7,11 @@ struct Point {
 #[derive(Debug)]
 enum Message {
     // TODO: Define the different variants used below.
+    Resize { width: u64, height: u64 },
+    Move(Point),
+    Echo(String),
+    ChangeColor(u64, u64, u64),
+    Quit,
 }
 
 impl Message {

exercises/08_enums/enums3.rs

@@ -46,6 +46,13 @@ impl State {
     fn process(&mut self, message: Message) {
         // TODO: Create a match expression to process the different message
         // variants using the methods defined above.
+        match message {
+            Message::Resize { width, height } => self.resize(width, height),
+            Message::Move(point) => self.move_position(point),
+            Message::Echo(s) => self.echo(s),
+            Message::ChangeColor(red, green, blue) => self.change_color(red, green, blue),
+            Message::Quit => self.quit(),
+        }
     }
 }
 

exercises/09_strings/strings1.rs

@@ -1,6 +1,6 @@
 // TODO: Fix the compiler error without changing the function signature.
 fn current_favorite_color() -> String {
-    "blue"
+    "blue".to_string()
 }
 
 fn main() {

exercises/09_strings/strings2.rs

@@ -6,7 +6,7 @@ fn is_a_color_word(attempt: &str) -> bool {
 fn main() {
     let word = String::from("green"); // Don't change 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.");

exercises/09_strings/strings3.rs

@@ -1,13 +1,18 @@
 fn trim_me(input: &str) -> &str {
     // TODO: Remove whitespace from both ends of a string.
+    input.trim()
 }
 
 fn compose_me(input: &str) -> String {
     // TODO: Add " world!" to the string! There are multiple ways to do this.
+    let world = " world!";
+    let s: String = input.to_owned() + world;
+    s
 }
 
 fn replace_me(input: &str) -> String {
     // TODO: Replace "cars" in the string with "balloons".
+    input.replace("cars", "balloons")
 }
 
 fn main() {

exercises/09_strings/strings4.rs

@@ -13,23 +13,23 @@ fn string(arg: String) {
 // Your task is to replace `placeholder(…)` with either `string_slice(…)`
 // or `string(…)` depending on what you think each value is.
 fn main() {
-    placeholder("blue");
+    string_slice("blue");
 
-    placeholder("red".to_string());
+    string("red".to_string());
 
-    placeholder(String::from("hi"));
+    string(String::from("hi"));
 
-    placeholder("rust is fun!".to_owned());
+    string("rust is fun!".to_owned());
 
-    placeholder(format!("Interpolation {}", "Station"));
+    string(format!("Interpolation {}", "Station"));
 
     // WARNING: This is byte indexing, not character indexing.
     // Character indexing can be done using `s.chars().nth(INDEX)`.
-    placeholder(&String::from("abc")[0..1]);
+    string_slice(&String::from("abc")[0..1]);
 
-    placeholder("  hello there ".trim());
+    string_slice("  hello there ".trim());
 
-    placeholder("Happy Monday!".replace("Mon", "Tues"));
+    string("Happy Monday!".replace("Mon", "Tues"));
 
-    placeholder("mY sHiFt KeY iS sTiCkY".to_lowercase());
+    string("mY sHiFt KeY iS sTiCkY".to_lowercase());
 }

exercises/10_modules/modules1.rs

@@ -5,7 +5,7 @@ mod sausage_factory {
         String::from("Ginger")
     }
 
-    fn make_sausage() {
+    pub fn make_sausage() {
         get_secret_recipe();
         println!("sausage!");
     }

exercises/10_modules/modules2.rs

@@ -6,6 +6,9 @@ mod delicious_snacks {
     // use self::fruits::PEAR as ???;
     // use self::veggies::CUCUMBER as ???;
     
+    pub use self::fruits::PEAR as fruit;
+    pub use self::veggies::CUCUMBER as veggie;
+
     mod fruits {
         pub const PEAR: &str = "Pear";
         pub const APPLE: &str = "Apple";

exercises/10_modules/modules3.rs

@@ -4,6 +4,8 @@
 // TODO: Bring `SystemTime` and `UNIX_EPOCH` from the `std::time` module into
 // your scope. Bonus style points if you can do it with one line!
 // use ???;
+use std::time::SystemTime;
+use std::time::UNIX_EPOCH;
 
 fn main() {
     match SystemTime::now().duration_since(UNIX_EPOCH) {

exercises/11_hashmaps/hashmaps1.rs

@@ -9,10 +9,11 @@ use std::collections::HashMap;
 fn fruit_basket() -> HashMap<String, u32> {
     // TODO: Declare the hash map.
     // let mut basket =
-
+    let mut basket = HashMap::new();
     // Two bananas are already given for you :)
     basket.insert(String::from("banana"), 2);
-
+    basket.insert(String::from("apple"), 2);
+    basket.insert(String::from("mango"), 1);
     // TODO: Put more fruits in your basket.
 
     basket

exercises/11_hashmaps/hashmaps2.rs

@@ -28,10 +28,12 @@ fn fruit_basket(basket: &mut HashMap<Fruit, u32>) {
         Fruit::Pineapple,
     ];
 
-    for fruit in fruit_kinds {
+    for _fruit in fruit_kinds {
         // TODO: Insert new fruits if they are not already present in the
         // basket. Note that you are not allowed to put any type of fruit that's
         // already present!
+        basket.insert(Fruit::Banana, 4);
+        basket.insert(Fruit::Pineapple, 3);
     }
 }
 

exercises/11_hashmaps/hashmaps3.rs

@@ -27,6 +27,11 @@ fn build_scores_table(results: &str) -> HashMap<&str, TeamScores> {
         let team_1_score: u8 = split_iterator.next().unwrap().parse().unwrap();
         let team_2_score: u8 = split_iterator.next().unwrap().parse().unwrap();
 
+        scores.entry(team_1_name).or_default().goals_scored += team_1_score;
+        scores.entry(team_2_name).or_default().goals_scored += team_2_score;
+
+        scores.entry(team_1_name).or_default().goals_conceded += team_2_score;
+        scores.entry(team_2_name).or_default().goals_conceded += team_1_score;
         // TODO: Populate the scores table with the extracted details.
         // Keep in mind that goals scored by team 1 will be the number of goals
         // conceded by team 2. Similarly, goals scored by team 2 will be the

exercises/12_options/options1.rs

@@ -4,6 +4,14 @@
 // `hour_of_day` is higher than 23.
 fn maybe_ice_cream(hour_of_day: u16) -> Option<u16> {
     // TODO: Complete the function body.
+
+    if hour_of_day < 22 {
+        Some(5)
+    } else if hour_of_day <= 23 {
+        Some(0)
+    } else {
+        None
+    }
 }
 
 fn main() {
@@ -18,7 +26,7 @@ mod tests {
     fn raw_value() {
         // TODO: Fix this test. How do you get the value contained in the
         // Option?
-        let ice_creams = maybe_ice_cream(12);
+        let ice_creams = maybe_ice_cream(12).unwrap();
 
         assert_eq!(ice_creams, 5); // Don't change this line.
     }

exercises/12_options/options2.rs

@@ -10,8 +10,12 @@ mod tests {
         let optional_target = Some(target);
 
         // TODO: Make this an if-let statement whose value is `Some`.
-        word = optional_target {
+        //
-            assert_eq!(word, target);
+        // word = optional_target {
+        //     assert_eq!(word, target);
+        // }
+        if let Some(word) = optional_target {
+            assert_eq!(word, target)
         }
     }
 
@@ -29,7 +33,13 @@ mod tests {
         // TODO: Make this a while-let statement. Remember that `Vec::pop()`
         // adds another layer of `Option`. You can do nested pattern matching
         // in if-let and while-let statements.
-        integer = optional_integers.pop() {
+        //
+        // integer = optional_integers.pop() {
+        //     assert_eq!(integer, cursor);
+        //     cursor -= 1;
+        // }
+
+        while let Some(Some(integer)) = optional_integers.pop() {
             assert_eq!(integer, cursor);
             cursor -= 1;
         }

exercises/12_options/options3.rs

@@ -9,7 +9,9 @@ fn main() {
 
     // TODO: Fix the compiler error by adding something to this match statement.
     match optional_point {
-        Some(p) => println!("Coordinates are {},{}", p.x, p.y),
+        Some(ref p) => {
+            println!("Coordinates are {},{}", p.x, p.y)
+        }
         _ => panic!("No match!"),
     }
 

exercises/quizzes/quiz1.rs

@@ -11,6 +11,18 @@
 // TODO: Write a function that calculates the price of an order of apples given
 // the quantity bought.
 // fn calculate_price_of_apples(???) -> ??? { ??? }
+fn calculate_price_of_apples(apples: i32) -> i32 {
+    let mut cost: i32 = 2;
+
+    if apples > 40 {
+        cost = 1;
+        cost *= apples;
+        cost
+    } else {
+        cost *= apples;
+        cost
+    }
+}
 
 fn main() {
     // You can optionally experiment here.

exercises/quizzes/quiz2.rs

@@ -28,6 +28,25 @@ mod my_module {
 
     // TODO: Complete the function as described above.
     // pub fn transformer(input: ???) -> ??? { ??? }
+
+    pub fn transformer(input: Vec<(String, Command)>) -> Vec<String> {
+        let mut output = Vec::new();
+        for (s, cmd) in input {
+            let transformed = match cmd {
+                Command::Uppercase => s.to_uppercase(),
+                Command::Trim => s.trim().to_owned(),
+                Command::Append(n) => {
+                    let mut out = s;
+                    for _ in 0..n {
+                        out.push_str("bar");
+                    }
+                    out
+                }
+            };
+            output.push(transformed)
+        }
+        output
+    }
 }
 
 fn main() {
@@ -39,6 +58,7 @@ mod tests {
     // TODO: What do we need to import to have `transformer` in scope?
     // use ???;
     use super::Command;
+    use crate::my_module::transformer;
 
     #[test]
     fn it_works() {