From 4c1e01267e4c0d590f3a9f331758126e4a7fe7a8 Mon Sep 17 00:00:00 2001
From: 0xChasingFire <0xchasingfire@gmail.com>
Date: Sat, 22 May 2021 15:15:21 +0800
Subject: [PATCH] collections
---
exercises/collections/hashmap1.rs | 6 +++---
exercises/collections/hashmap2.rs | 7 +++++--
exercises/collections/vec1.rs | 4 +---
exercises/collections/vec2.rs | 3 +--
exercises/quiz2.rs | 22 ++++++++++------------
exercises/strings/strings1.rs | 4 +---
exercises/strings/strings2.rs | 4 +---
7 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/exercises/collections/hashmap1.rs b/exercises/collections/hashmap1.rs
index 64b5a7f..e9ac082 100644
--- a/exercises/collections/hashmap1.rs
+++ b/exercises/collections/hashmap1.rs
@@ -11,15 +11,15 @@
// 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(); // TODO: declare your hash map here.
// Two bananas are already given for you :)
basket.insert(String::from("banana"), 2);
+ basket.insert(String::from("apple"), 2);
+ basket.insert(String::from("orange"), 2);
// TODO: Put more fruits in your basket here.
diff --git a/exercises/collections/hashmap2.rs b/exercises/collections/hashmap2.rs
index 0abe19a..8c87299 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)]
@@ -38,6 +36,11 @@ 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::Apple).or_insert(5);
+ basket.entry(Fruit::Banana).or_insert(5);
+ basket.entry(Fruit::Mango).or_insert(5);
+ basket.entry(Fruit::Lychee).or_insert(5);
+ basket.entry(Fruit::Pineapple).or_insert(5);
}
}
diff --git a/exercises/collections/vec1.rs b/exercises/collections/vec1.rs
index b144fb9..8a30c35 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 = a.to_vec(); // 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 6595e40..436f2ce 100644
--- a/exercises/collections/vec2.rs
+++ b/exercises/collections/vec2.rs
@@ -7,12 +7,11 @@
// 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].
diff --git a/exercises/quiz2.rs b/exercises/quiz2.rs
index de0dce9..37c33a5 100644
--- a/exercises/quiz2.rs
+++ b/exercises/quiz2.rs
@@ -7,8 +7,6 @@
// you think each value is. That is, add either `string_slice` or `string`
// before the parentheses on each line. If you're right, it will compile!
-// I AM NOT DONE
-
fn string_slice(arg: &str) {
println!("{}", arg);
}
@@ -17,14 +15,14 @@ fn string(arg: String) {
}
fn main() {
- ???("blue");
- ???("red".to_string());
- ???(String::from("hi"));
- ???("rust is fun!".to_owned());
- ???("nice weather".into());
- ???(format!("Interpolation {}", "Station"));
- ???(&String::from("abc")[0..1]);
- ???(" hello there ".trim());
- ???("Happy Monday!".to_string().replace("Mon", "Tues"));
- ???("mY sHiFt KeY iS sTiCkY".to_lowercase());
+ string_slice("blue");
+ string("red".to_string());
+ string(String::from("hi"));
+ string("rust is fun!".to_owned());
+ string("nice weather".into());
+ string(format!("Interpolation {}", "Station"));
+ string_slice(&String::from("abc")[0..1]);
+ string_slice(" hello there ".trim());
+ string("Happy Monday!".to_string().replace("Mon", "Tues"));
+ string("mY sHiFt KeY iS sTiCkY".to_lowercase());
}
diff --git a/exercises/strings/strings1.rs b/exercises/strings/strings1.rs
index 8090244..e43c88a 100644
--- a/exercises/strings/strings1.rs
+++ b/exercises/strings/strings1.rs
@@ -2,13 +2,11 @@
// Make me compile without changing the function signature!
// Execute `rustlings hint strings1` for hints ;)
-// I AM NOT DONE
-
fn main() {
let answer = current_favorite_color();
println!("My current favorite color is {}", answer);
}
fn current_favorite_color() -> String {
- "blue"
+ String::from("blue")
}
diff --git a/exercises/strings/strings2.rs b/exercises/strings/strings2.rs
index 5a2ce74..a048f88 100644
--- a/exercises/strings/strings2.rs
+++ b/exercises/strings/strings2.rs
@@ -2,11 +2,9 @@
// Make me compile without changing the function signature!
// Execute `rustlings hint strings2` for hints :)
-// I AM NOT DONE
-
fn main() {
let word = String::from("green"); // Try not changing 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.");