From bef39b125961310b34b34871e480a82e82af4678 Mon Sep 17 00:00:00 2001
From: Mickael Fortunato <morsi.morsicus@gmail.com>
Date: Thu, 18 Mar 2021 18:39:22 +0100
Subject: [PATCH 1/2] fix(collections): Naming exercises for vectors and
hashmap
---
exercises/collections/vec2.rs | 7 +------
info.toml | 8 ++++----
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/exercises/collections/vec2.rs b/exercises/collections/vec2.rs
index ec6cfc00..08b6bbf5 100644
--- a/exercises/collections/vec2.rs
+++ b/exercises/collections/vec2.rs
@@ -28,11 +28,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/info.toml b/info.toml
index 2068750a..baae76af 100644
--- a/info.toml
+++ b/info.toml
@@ -359,7 +359,7 @@ each constant."""
# COLLECTIONS
[[exercises]]
-name = "collections1"
+name = "vec1"
path = "exercises/collections/vec1.rs"
mode = "test"
hint = """
@@ -373,7 +373,7 @@ of the Rust book to learn more.
"""
[[exercises]]
-name = "collections2"
+name = "vec2"
path = "exercises/collections/vec2.rs"
mode = "test"
hint = """
@@ -383,7 +383,7 @@ Hint 2: Check the suggestion from the compiler error ;)
"""
[[exercises]]
-name = "collections3"
+name = "hashmap1"
path = "exercises/collections/hashmap1.rs"
mode = "test"
hint = """
@@ -394,7 +394,7 @@ Hint 2: Number of fruits should be at least 5. And you have to put
"""
[[exercises]]
-name = "collections4"
+name = "hashmap2"
path = "exercises/collections/hashmap2.rs"
mode = "test"
hint = """
From ab9995e76e10fb1159f9ca1f378e3e11838dc5bc Mon Sep 17 00:00:00 2001
From: Mickael Fortunato <morsi.morsicus@gmail.com>
Date: Thu, 18 Mar 2021 18:45:01 +0100
Subject: [PATCH 2/2] doc: Update collections exercises instruction to match
the standard naming
---
exercises/collections/hashmap1.rs | 6 ++----
exercises/collections/hashmap2.rs | 6 ++----
exercises/collections/vec1.rs | 2 +-
exercises/collections/vec2.rs | 2 +-
4 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/exercises/collections/hashmap1.rs b/exercises/collections/hashmap1.rs
index b1dc0bbd..64b5a7f3 100644
--- a/exercises/collections/hashmap1.rs
+++ b/exercises/collections/hashmap1.rs
@@ -8,7 +8,7 @@
//
// Make me compile and pass the tests!
//
-// Execute the command `rustlings hint collections3` if you need
+// Execute the command `rustlings hint hashmap1` if you need
// hints.
// I AM NOT DONE
@@ -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 7e25be7c..f865fe1c 100644
--- a/exercises/collections/hashmap2.rs
+++ b/exercises/collections/hashmap2.rs
@@ -9,7 +9,7 @@
//
// Make me pass the tests!
//
-// Execute the command `rustlings hint collections4` if you need
+// Execute the command `rustlings hint hashmap2` if you need
// hints.
// I AM NOT DONE
@@ -75,9 +75,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 f6bc837c..b144fb94 100644
--- a/exercises/collections/vec1.rs
+++ b/exercises/collections/vec1.rs
@@ -2,7 +2,7 @@
// Your task is to create a `Vec` which holds the exact same elements
// as in the array `a`.
// Make me compile and pass the test!
-// Execute the command `rustlings hint collections1` if you need hints.
+// Execute the command `rustlings hint vec1` if you need hints.
// I AM NOT DONE
diff --git a/exercises/collections/vec2.rs b/exercises/collections/vec2.rs
index 08b6bbf5..6595e401 100644
--- a/exercises/collections/vec2.rs
+++ b/exercises/collections/vec2.rs
@@ -4,7 +4,7 @@
//
// Make me pass the test!
//
-// Execute the command `rustlings hint collections2` if you need
+// Execute the command `rustlings hint vec2` if you need
// hints.
// I AM NOT DONE