finish hashmap and quiz2

exercises/11_hashmaps/hashmaps1.rs

@@ -11,18 +11,18 @@
 // Execute `rustlings hint hashmaps1` or use the `hint` watch subcommand for a
 // hint.
 
-// I AM NOT DONE
-
 use std::collections::HashMap;
 
 fn fruit_basket() -> HashMap<String, u32> {
-    let mut basket = // TODO: declare your hash map here.
+    let mut basket: HashMap<String, u32> = HashMap::new();
 
     // Two bananas are already given for you :)
     basket.insert(String::from("banana"), 2);
 
     // TODO: Put more fruits in your basket here.
 
+    basket.insert(String::from("apple"), 2);
+    basket.insert(String::from("orange"), 2);
     basket
 }
 

exercises/11_hashmaps/hashmaps2.rs

@@ -14,8 +14,6 @@
 // Execute `rustlings hint hashmaps2` or use the `hint` watch subcommand for a
 // hint.
 
-// I AM NOT DONE
-
 use std::collections::HashMap;
 
 #[derive(Hash, PartialEq, Eq)]
@@ -37,9 +35,9 @@ fn fruit_basket(basket: &mut HashMap<Fruit, u32>) {
     ];
 
     for fruit in fruit_kinds {
-        // TODO: Insert new fruits if they are not already present in the
+        if !basket.contains_key(&fruit) {
-        // basket. Note that you are not allowed to put any type of fruit that's
+            basket.insert(fruit, 1);
-        // already present!
+        }
     }
 }
 
@@ -81,7 +79,7 @@ mod tests {
         let count = basket.values().sum::<u32>();
         assert!(count > 11);
     }
-    
+
     #[test]
     fn all_fruit_types_in_basket() {
         let mut basket = get_fruit_basket();

exercises/11_hashmaps/hashmaps3.rs

@@ -14,8 +14,6 @@
 // Execute `rustlings hint hashmaps3` or use the `hint` watch subcommand for a
 // hint.
 
-// I AM NOT DONE
-
 use std::collections::HashMap;
 
 // A structure to store the goal details of a team.
@@ -34,11 +32,20 @@ fn build_scores_table(results: String) -> HashMap<String, Team> {
         let team_1_score: u8 = v[2].parse().unwrap();
         let team_2_name = v[1].to_string();
         let team_2_score: u8 = v[3].parse().unwrap();
-        // TODO: Populate the scores table with details extracted from the
+        // init
-        // current line. Keep in mind that goals scored by team_1
+        let team1 = scores.entry(team_1_name).or_insert(Team {
-        // will be the number of goals conceded from team_2, and similarly
+            goals_scored: 0,
-        // goals scored by team_2 will be the number of goals conceded by
+            goals_conceded: 0,
-        // team_1.
+        });
+
+        (*team1).goals_scored += team_1_score;
+        (*team1).goals_conceded += team_2_score;
+        let team2 = scores.entry(team_2_name).or_insert(Team {
+            goals_scored: 0,
+            goals_conceded: 0,
+        });
+        (*team2).goals_scored += team_2_score;
+        (*team2).goals_conceded += team_1_score;
     }
     scores
 }

exercises/quiz2.rs

@@ -20,8 +20,6 @@
 //
 // No hints this time!
 
-// I AM NOT DONE
-
 pub enum Command {
     Uppercase,
     Trim,
@@ -31,12 +29,20 @@ pub enum Command {
 mod my_module {
     use super::Command;
 
-    // TODO: Complete the function signature!
+    pub fn transformer(input: Vec<(String, Command)>) -> Vec<String> {
-    pub fn transformer(input: ???) -> ??? {
+        let mut output: Vec<String> = vec![];
-        // TODO: Complete the output declaration!
-        let mut output: ??? = vec![];
         for (string, command) in input.iter() {
-            // TODO: Complete the function body. You can do it!
+            match command {
+                Command::Uppercase => output.push(string.to_uppercase()),
+                Command::Trim => output.push(string.trim().into()),
+                Command::Append(len) => {
+                    let mut str: String = string.into();
+                    for _ in 0..*len {
+                        str.insert_str(str.len(), "bar");
+                    }
+                    output.push(str.into())
+                }
+            }
         }
         output
     }
@@ -45,7 +51,7 @@ mod my_module {
 #[cfg(test)]
 mod tests {
     // TODO: What do we need to import to have `transformer` in scope?
-    use ???;
+    use super::my_module::transformer;
     use super::Command;
 
     #[test]