From 7226111d7dfe70e0805fdc60091ef06b0440a7eb Mon Sep 17 00:00:00 2001
From: Tyler Cardinal <83625450+tjcardinal@users.noreply.github.com>
Date: Sun, 9 May 2021 00:24:24 -0500
Subject: [PATCH] Complete collection exercises (#9)
---
exercises/collections/hashmap1.rs | 8 +++-----
exercises/collections/hashmap2.rs | 8 +++-----
exercises/collections/vec1.rs | 4 +---
exercises/collections/vec2.rs | 5 +----
4 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/exercises/collections/hashmap1.rs b/exercises/collections/hashmap1.rs
index 64b5a7f..6ef72bf 100644
--- a/exercises/collections/hashmap1.rs
+++ b/exercises/collections/hashmap1.rs
@@ -11,18 +11,16 @@
// Execute the command `rustlings hint hashmap1` if you need
// hints.
-// 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::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("grape"), 3);
basket
}
diff --git a/exercises/collections/hashmap2.rs b/exercises/collections/hashmap2.rs
index 0abe19a..5c315c0 100644
--- a/exercises/collections/hashmap2.rs
+++ b/exercises/collections/hashmap2.rs
@@ -12,8 +12,6 @@
// Execute the command `rustlings hint hashmap2` if you need
// hints.
-// I AM NOT DONE
-
use std::collections::HashMap;
#[derive(Hash, PartialEq, Eq)]
@@ -35,9 +33,9 @@ fn fruit_basket(basket: &mut HashMap<Fruit, u32>) {
];
for fruit in fruit_kinds {
- // TODO: Put new fruits if not already present. Note that you
- // are not allowed to put any type of fruit that's already
- // present!
+ if !basket.contains_key(&fruit) {
+ basket.insert(fruit, 3);
+ }
}
}
diff --git a/exercises/collections/vec1.rs b/exercises/collections/vec1.rs
index b144fb9..7db63d8 100644
--- a/exercises/collections/vec1.rs
+++ b/exercises/collections/vec1.rs
@@ -4,11 +4,9 @@
// Make me compile and pass the test!
// Execute the command `rustlings hint vec1` if you need hints.
-// I AM NOT DONE
-
fn array_and_vec() -> ([i32; 4], Vec<i32>) {
let a = [10, 20, 30, 40]; // a plain array
- let v = // TODO: declare your vector here with the macro for vectors
+ let v = vec![10, 20, 30, 40];
(a, v)
}
diff --git a/exercises/collections/vec2.rs b/exercises/collections/vec2.rs
index 6595e40..2b85627 100644
--- a/exercises/collections/vec2.rs
+++ b/exercises/collections/vec2.rs
@@ -7,12 +7,9 @@
// Execute the command `rustlings hint vec2` if you need
// hints.
-// I AM NOT DONE
-
fn vec_loop(mut v: Vec<i32>) -> Vec<i32> {
for i in v.iter_mut() {
- // TODO: Fill this up so that each element in the Vec `v` is
- // multiplied by 2.
+ *i *= 2;
}
// At this point, `v` should be equal to [4, 8, 12, 16, 20].