From 96dd044f2b668e8e84cac7afee7c79b3c604b537 Mon Sep 17 00:00:00 2001
From: Simon Halimi <halimisimon@gmail.com>
Date: Tue, 13 Apr 2021 17:18:33 +0200
Subject: [PATCH] ajout des collections
---
exercises/collections/hashmap1.rs | 12 ++++++------
exercises/collections/hashmap2.rs | 11 ++++++-----
exercises/collections/vec1.rs | 4 +---
exercises/collections/vec2.rs | 5 +----
exercises/modules/modules1.rs | 4 +---
exercises/modules/modules2.rs | 6 ++----
6 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/exercises/collections/hashmap1.rs b/exercises/collections/hashmap1.rs
index b1dc0bb..5ffe359 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::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("banana"), 1);
+ basket.insert(String::from("tomato"), 2);
+ basket.insert(String::from("dog"), 3);
+ basket.insert(String::from("stuff"), 4);
+ basket.insert(String::from("andstuff"), 5);
basket
}
diff --git a/exercises/collections/hashmap2.rs b/exercises/collections/hashmap2.rs
index 7e25be7..a7b2d33 100644
--- a/exercises/collections/hashmap2.rs
+++ b/exercises/collections/hashmap2.rs
@@ -12,8 +12,6 @@
// Execute the command `rustlings hint collections4` if you need
// hints.
-// I AM NOT DONE
-
use std::collections::HashMap;
#[derive(Hash, PartialEq, Eq)]
@@ -35,9 +33,12 @@ 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, 0);
+ // }
+
+ // basket.insert(fruit, basket[fruit] + 1);
+ *basket.entry(fruit).or_insert(12) + 1;
}
}
diff --git a/exercises/collections/vec1.rs b/exercises/collections/vec1.rs
index f6bc837..e337ab6 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];
(a, v)
}
diff --git a/exercises/collections/vec2.rs b/exercises/collections/vec2.rs
index ec6cfc0..40313f2 100644
--- a/exercises/collections/vec2.rs
+++ b/exercises/collections/vec2.rs
@@ -7,12 +7,9 @@
// 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].
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";