From c59e85df74bf482783d288ef012ea1e62d8ec750 Mon Sep 17 00:00:00 2001
From: Emre AYDIN <aeaydin1@gmail.com>
Date: Tue, 5 Jan 2021 17:26:26 +0300
Subject: [PATCH] Modules and collections exercises complete
---
exercises/collections/hashmap1.rs | 10 ++++------
exercises/collections/hashmap2.rs | 5 ++---
exercises/collections/vec1.rs | 4 +---
exercises/collections/vec2.rs | 10 ++--------
exercises/modules/modules1.rs | 4 +---
exercises/modules/modules2.rs | 6 ++----
6 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/exercises/collections/hashmap1.rs b/exercises/collections/hashmap1.rs
index b1dc0bb..7fbf633 100644
--- a/exercises/collections/hashmap1.rs
+++ b/exercises/collections/hashmap1.rs
@@ -11,17 +11,17 @@
// Execute the command `rustlings hint collections3` 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<String, u32> = HashMap::new(); // TODO: declare your hash map here.
// 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("orange"), 3);
+ basket.insert(String::from("pear"), 4);
basket
}
@@ -39,8 +39,6 @@ mod tests {
#[test]
fn at_least_five_fruits() {
let basket = fruit_basket();
- assert!(basket
- .values()
- .sum::<u32>() >= 5);
+ assert!(basket.values().sum::<u32>() >= 5);
}
}
diff --git a/exercises/collections/hashmap2.rs b/exercises/collections/hashmap2.rs
index 7e25be7..9fc5e62 100644
--- a/exercises/collections/hashmap2.rs
+++ b/exercises/collections/hashmap2.rs
@@ -38,6 +38,7 @@ fn fruit_basket(basket: &mut HashMap<Fruit, u32>) {
// TODO: Put new fruits if not already present. Note that you
// are not allowed to put any type of fruit that's already
// present!
+ basket.entry(fruit).or_insert(19);
}
}
@@ -75,9 +76,7 @@ mod tests {
fn greater_than_eleven_fruits() {
let mut basket = get_fruit_basket();
fruit_basket(&mut basket);
- let count = basket
- .values()
- .sum::<u32>();
+ let count = basket.values().sum::<u32>();
assert!(count > 11);
}
}
diff --git a/exercises/collections/vec1.rs b/exercises/collections/vec1.rs
index f6bc837..4433630 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 collections1` 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]; // TODO: declare your vector here with the macro for vectors
(a, v)
}
diff --git a/exercises/collections/vec2.rs b/exercises/collections/vec2.rs
index ec6cfc0..89de765 100644
--- a/exercises/collections/vec2.rs
+++ b/exercises/collections/vec2.rs
@@ -7,12 +7,11 @@
// Execute the command `rustlings hint collections2` 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].
@@ -28,11 +27,6 @@ mod tests {
let v: Vec<i32> = (1..).filter(|x| x % 2 == 0).take(5).collect();
let ans = vec_loop(v.clone());
- assert_eq!(
- ans,
- v.iter()
- .map(|x| x * 2)
- .collect::<Vec<i32>>()
- );
+ assert_eq!(ans, v.iter().map(|x| x * 2).collect::<Vec<i32>>());
}
}
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/modules/modules2.rs b/exercises/modules/modules2.rs
index fde439d..50a3f08 100644
--- a/exercises/modules/modules2.rs
+++ b/exercises/modules/modules2.rs
@@ -1,11 +1,9 @@
// 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";