Merge remote-tracking branch 'upstream/main' into main

* upstream/main: release: 4.5.0 docs: update .all-contributorsrc [skip ci] docs: update README.md [skip ci] fix(quiz1): Updated question description (rust-lang#794) docs: update .all-contributorsrc [skip ci] docs: update README.md [skip ci] docs: Update collections README with HashMap link docs: Update exercise to chapter mapping for HashMap fix: Correct small typo in exercises/conversions/from_str.rs Correct small typo in exercises/conversions/from_str.rs
wh5a · Jul 9, 2021 · 4efafa8 · 4efafa8
2 parents f9af159 + 6948905
commit 4efafa8
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 10 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -911,6 +911,24 @@
       "contributions": [
         "doc"
       ]
+    },
+    {
+      "login": "lauralindzey",
+      "name": "lauralindzey",
+      "avatar_url": "https://avatars.githubusercontent.com/u/65185744?v=4",
+      "profile": "https://github.com/lauralindzey",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "sinharaksh1t",
+      "name": "Rakshit Sinha",
+      "avatar_url": "https://avatars.githubusercontent.com/u/28585848?v=4",
+      "profile": "https://github.com/sinharaksh1t",
+      "contributions": [
+        "content"
+      ]
     }
   ],
   "contributorsPerLine": 8,

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,27 @@
+<a name="4.5.0"></a>
+## 4.5.0 (2021-07-07)
+
+
+#### Features
+
+*   Add move_semantics5 exercise. (#746) ([399ab328](https://github.com/rust-lang/rustlings/commit/399ab328d8d407265c09563aa4ef4534b2503ff2))
+* **cli:**  Add "next" to run the next unsolved exercise. (#785) ([d20e413a](https://github.com/rust-lang/rustlings/commit/d20e413a68772cd493561f2651cf244e822b7ca5))
+
+#### Bug Fixes
+
+*   rename result1 to errors4 ([50ab289d](https://github.com/rust-lang/rustlings/commit/50ab289da6b9eb19a7486c341b00048c516b88c0))
+*   move_semantics5 hints ([1b858285](https://github.com/rust-lang/rustlings/commit/1b85828548f46f58b622b5e0c00f8c989f928807))
+*   remove trailing whitespaces from iterators1 ([4d4fa774](https://github.com/rust-lang/rustlings/commit/4d4fa77459392acd3581c6068aa8be9a02de12fc))
+*   add hints to generics1 and generics2 exercises ([31457940](https://github.com/rust-lang/rustlings/commit/31457940846b3844d78d4a4d2b074bc8d6aaf1eb))
+*   remove trailing whitespace ([d9b69bd1](https://github.com/rust-lang/rustlings/commit/d9b69bd1a0a7a99f2c0d80933ad2eea44c8c71b2))
+* **installation:**  first PowerShell command ([aa9a943d](https://github.com/rust-lang/rustlings/commit/aa9a943ddf3ae260782e73c26bcc9db60e5894b6))
+* **iterators5:**  derive Clone, Copy ([91fc9e31](https://github.com/rust-lang/rustlings/commit/91fc9e3118f4af603c9911698cc2a234725cb032))
+* **quiz1:**  Updated question description (#794) ([d8766496](https://github.com/rust-lang/rustlings/commit/d876649616cc8a8dd5f539f8bc1a5434b960b1e9))
+* **try_from_into, from_str:**  hints for dyn Error ([11d2cf0d](https://github.com/rust-lang/rustlings/commit/11d2cf0d604dee3f5023c17802d69438e69fa50e))
+* **variables5:**  confine the answer further ([48ffcbd2](https://github.com/rust-lang/rustlings/commit/48ffcbd2c4cc4d936c2c7480019190f179813cc5))
+
+
+
 <a name="4.4.0"></a>
 ## 4.4.0 (2021-04-24)
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "rustlings"
-version = "4.4.0"
-authors = ["Marisa <[email protected]>", "Carol (Nichols || Goulding) <[email protected]>"]
+version = "4.5.0"
+authors = ["anastasie <[email protected]>", "Carol (Nichols || Goulding) <[email protected]>"]
 edition = "2018"
 
 [dependencies]

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-98-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-100-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 # rustlings 🦀❤️
@@ -60,8 +60,8 @@ When you get a permission denied message then you have to exclude the directory
 Basically: Clone the repository at the latest tag, run `cargo install`.
 
 ```bash
-# find out the latest version at https://github.com/rust-lang/rustlings/releases/latest (on edit 4.4.0)
-git clone -b 4.4.0 --depth 1 https://github.com/rust-lang/rustlings
+# find out the latest version at https://github.com/rust-lang/rustlings/releases/latest (on edit 4.5.0)
+git clone -b 4.5.0 --depth 1 https://github.com/rust-lang/rustlings
 cd rustlings
 cargo install --force --path .
 ```
@@ -300,6 +300,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <tr>
     <td align="center"><a href="https://richthofen.io/"><img src="https://avatars.githubusercontent.com/u/7576730?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Richthofen</b></sub></a><br /><a href="https://github.com/rust-lang/rustlings/commits?author=jazzplato" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/cseltol"><img src="https://avatars.githubusercontent.com/u/64264529?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ivan Nerazumov</b></sub></a><br /><a href="https://github.com/rust-lang/rustlings/commits?author=cseltol" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/lauralindzey"><img src="https://avatars.githubusercontent.com/u/65185744?v=4?s=100" width="100px;" alt=""/><br /><sub><b>lauralindzey</b></sub></a><br /><a href="https://github.com/rust-lang/rustlings/commits?author=lauralindzey" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/sinharaksh1t"><img src="https://avatars.githubusercontent.com/u/28585848?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Rakshit Sinha</b></sub></a><br /><a href="#content-sinharaksh1t" title="Content">🖋</a></td>
   </tr>
 </table>
 

diff --git a/exercises/README.md b/exercises/README.md
@@ -10,7 +10,7 @@
 | structs                | §5.1          |
 | enums                  | §6            |
 | modules                | §7.2          |
-| collections            | §8.1          |
+| collections            | §8.1, §8.3    |
 | strings                | §8.2          |
 | error_handling         | §9            |
 | generics               | §10           |

diff --git a/exercises/collections/README.md b/exercises/collections/README.md
@@ -20,3 +20,4 @@ structures that are used very often in Rust programs:
 ## Further information
 
 - [Storing Lists of Values with Vectors](https://doc.rust-lang.org/stable/book/ch08-01-vectors.html)
+- [Storing Keys with Associated Values in Hash Maps](https://doc.rust-lang.org/book/ch08-03-hash-maps.html)
diff --git a/exercises/conversions/from_str.rs b/exercises/conversions/from_str.rs
@@ -18,7 +18,7 @@ struct Person {
 // 4. Extract the first element from the split operation and use it as the name
 // 5. Extract the other element from the split operation and parse it into a `usize` as the age
 //    with something like `"4".parse::<usize>()`
-// 5. If while extracting the name and the age something goes wrong, an error should be returned
+// 6. If while extracting the name and the age something goes wrong, an error should be returned
 // If everything goes well, then return a Result of a Person object
 
 impl FromStr for Person {

diff --git a/exercises/quiz1.rs b/exercises/quiz1.rs
@@ -5,7 +5,7 @@
 
 // Mary is buying apples. One apple usually costs 2 Rustbucks, but if you buy
 // more than 40 at once, each apple only costs 1! Write a function that calculates
-// the price of an order of apples given the order amount. No hints this time!
+// the price of an order of apples given the quantity bought. No hints this time!
 
 fn calculate_apple_price(count: i32) -> i32 {
     if (count > 40) { count } else { count * 2 }

diff --git a/src/main.rs b/src/main.rs
@@ -23,7 +23,7 @@ mod run;
 mod verify;
 
 // In sync with crate version
-const VERSION: &str = "4.4.0";
+const VERSION: &str = "4.5.0";
 
 #[derive(FromArgs, PartialEq, Debug)]
 /// Rustlings is a collection of small exercises to get you used to writing and reading Rust code
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,3 +20,4 @@ structures that are used very often in Rust programs:
		## Further information

		- [Storing Lists of Values with Vectors](https://doc.rust-lang.org/stable/book/ch08-01-vectors.html)
		- [Storing Keys with Associated Values in Hash Maps](https://doc.rust-lang.org/book/ch08-03-hash-maps.html)