release: 4.0.0

Merge pull request #458 from Sowed/main
Merge pull request #1 from Sowed/then-to-than-docs-patch
2025-12-26 00:11:49 +02:00 · 2020-07-08 11:35:27 +02:00 · 2020-07-01 10:19:45 +02:00 · 2020-06-27 16:49:39 +04:00 · 2020-06-27 15:58:53 +04:00 · 2020-06-22 04:47:27 +02:00
52 changed files with 1849 additions and 295 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -0,0 +1,465 @@
+{
+  "files": [
+    "README.md"
+  ],
+  "imageSize": 100,
+  "commit": false,
+  "contributors": [
+    {
+      "login": "carols10cents",
+      "name": "Carol (Nichols || Goulding)",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/193874?v=4",
+      "profile": "http://carol-nichols.com",
+      "contributions": [
+        "code",
+        "content"
+      ]
+    },
+    {
+      "login": "QuietMisdreavus",
+      "name": "QuietMisdreavus",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/5217170?v=4",
+      "profile": "https://twitter.com/QuietMisdreavus",
+      "contributions": [
+        "code",
+        "content"
+      ]
+    },
+    {
+      "login": "robertlugg",
+      "name": "Robert M Lugg",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/6054540?v=4",
+      "profile": "https://github.com/robertlugg",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "hynek",
+      "name": "Hynek Schlawack",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/41240?v=4",
+      "profile": "https://hynek.me/about/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "spacekookie",
+      "name": "Katharina Fey",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/7669898?v=4",
+      "profile": "https://spacekookie.de",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "lukabavdaz",
+      "name": "lukabavdaz",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/9624558?v=4",
+      "profile": "https://github.com/lukabavdaz",
+      "contributions": [
+        "code",
+        "content"
+      ]
+    },
+    {
+      "login": "evestera",
+      "name": "Erik Vesteraas",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/4187449?v=4",
+      "profile": "http://vestera.as",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Delet0r",
+      "name": "delet0r",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/23195618?v=4",
+      "profile": "https://github.com/Delet0r",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "shaunbennett",
+      "name": "Shaun Bennett",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/10522375?v=4",
+      "profile": "http://phinary.ca",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "abagshaw",
+      "name": "Andrew Bagshaw",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/8594541?v=4",
+      "profile": "https://github.com/abagshaw",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "kisom",
+      "name": "Kyle Isom",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/175578?v=4",
+      "profile": "https://ai6ua.net/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ColinPitrat",
+      "name": "Colin Pitrat",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/1541863?v=4",
+      "profile": "https://github.com/ColinPitrat",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "zacanger",
+      "name": "Zac Anger",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/12520493?v=4",
+      "profile": "https://zacanger.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mgeier",
+      "name": "Matthias Geier",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/705404?v=4",
+      "profile": "https://github.com/mgeier",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "cjpearce",
+      "name": "Chris Pearce",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/3453268?v=4",
+      "profile": "https://github.com/cjpearce",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "yvan-sraka",
+      "name": "Yvan Sraka",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/705213?v=4",
+      "profile": "https://yvan-sraka.github.io",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "dendi239",
+      "name": "Denys Smirnov",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/16478650?v=4",
+      "profile": "https://github.com/dendi239",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "eddyp",
+      "name": "eddyp",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/123772?v=4",
+      "profile": "https://github.com/eddyp",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "briankung",
+      "name": "Brian Kung",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/2836167?v=4",
+      "profile": "http://about.me/BrianKung",
+      "contributions": [
+        "code",
+        "content"
+      ]
+    },
+    {
+      "login": "miller-time",
+      "name": "Russell",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/281039?v=4",
+      "profile": "https://rcousineau.gitlab.io",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "danwilhelm",
+      "name": "Dan Wilhelm",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/6137185?v=4",
+      "profile": "http://danwilhelm.com",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Jesse-Cameron",
+      "name": "Jesse",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/3723654?v=4",
+      "profile": "https://github.com/Jesse-Cameron",
+      "contributions": [
+        "code",
+        "content"
+      ]
+    },
+    {
+      "login": "MrFroop",
+      "name": "Fredrik Jambrén",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/196700?v=4",
+      "profile": "https://github.com/MrFroop",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "petemcfarlane",
+      "name": "Pete McFarlane",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/3472717?v=4",
+      "profile": "https://github.com/petemcfarlane",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "nkanderson",
+      "name": "nkanderson",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/4128825?v=4",
+      "profile": "https://github.com/nkanderson",
+      "contributions": [
+        "code",
+        "content"
+      ]
+    },
+    {
+      "login": "ajaxm",
+      "name": "Ajax M",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/13360138?v=4",
+      "profile": "https://github.com/ajaxm",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "Dylnuge",
+      "name": "Dylan Nugent",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/118624?v=4",
+      "profile": "https://dylnuge.com",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "vyaslav",
+      "name": "vyaslav",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1385427?v=4",
+      "profile": "https://github.com/vyaslav",
+      "contributions": [
+        "code",
+        "content"
+      ]
+    },
+    {
+      "login": "gdoenlen",
+      "name": "George",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/17297466?v=4",
+      "profile": "https://join.sfxd.org",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "nyxtom",
+      "name": "Thomas Holloway",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/222763?v=4",
+      "profile": "https://github.com/nyxtom",
+      "contributions": [
+        "code",
+        "content"
+      ]
+    },
+    {
+      "login": "workingjubilee",
+      "name": "Jubilee",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/46493976?v=4",
+      "profile": "https://github.com/workingjubilee",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "WofWca",
+      "name": "WofWca",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/39462442?v=4",
+      "profile": "https://github.com/WofWca",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "jrvidal",
+      "name": "Roberto Vidal",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/1636604?v=4",
+      "profile": "https://github.com/jrvidal",
+      "contributions": [
+        "code",
+        "doc",
+        "ideas",
+        "maintenance"
+      ]
+    },
+    {
+      "login": "jensim",
+      "name": "Jens",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/3663856?v=4",
+      "profile": "https://github.com/jensim",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "rahatarmanahmed",
+      "name": "Rahat Ahmed",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/3174006?v=4",
+      "profile": "http://rahatah.me/d",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "AbdouSeck",
+      "name": "Abdou Seck",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/6490055?v=4",
+      "profile": "https://github.com/AbdouSeck",
+      "contributions": [
+        "code",
+        "content",
+        "review"
+      ]
+    },
+    {
+      "login": "codehearts",
+      "name": "Katie",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/2885412?v=4",
+      "profile": "https://codehearts.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Socratides",
+      "name": "Socrates",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/27732983?v=4",
+      "profile": "https://github.com/Socratides",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "gnodarse",
+      "name": "gnodarse",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/46761795?v=4",
+      "profile": "https://github.com/gnodarse",
+      "contributions": [
+        "content"
+      ]
+    },
+    {
+      "login": "harrisonmetz",
+      "name": "Harrison Metzger",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/7883408?v=4",
+      "profile": "https://github.com/harrisonmetz",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "TorbenJ",
+      "name": "Torben Jonas",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/9077102?v=4",
+      "profile": "https://github.com/TorbenJ",
+      "contributions": [
+        "code",
+        "content"
+      ]
+    },
+    {
+      "login": "pbx",
+      "name": "Paul Bissex",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/641?v=4",
+      "profile": "http://paulbissex.com/",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "sjmann",
+      "name": "Steven Mann",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/6589896?v=4",
+      "profile": "https://github.com/sjmann",
+      "contributions": [
+        "code",
+        "content"
+      ]
+    },
+    {
+      "login": "Tarnadas",
+      "name": "Mario Reder",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/5855071?v=4",
+      "profile": "https://smmdb.net/",
+      "contributions": [
+        "code",
+        "content"
+      ]
+    },
+    {
+      "login": "sl4m",
+      "name": "skim",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/47347?v=4",
+      "profile": "https://keybase.io/skim",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "sanjaykdragon",
+      "name": "Sanjay K",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/10261698?v=4",
+      "profile": "https://github.com/sanjaykdragon",
+      "contributions": [
+        "code",
+        "content"
+      ]
+    },
+    {
+      "login": "crodjer",
+      "name": "Rohan Jain",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/343499?v=4",
+      "profile": "http://www.rohanjain.in",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "saidaspen",
+      "name": "Said Aspen",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/7727687?v=4",
+      "profile": "https://www.saidaspen.se",
+      "contributions": [
+        "code",
+        "content"
+      ]
+    }
+  ],
+  "contributorsPerLine": 8,
+  "projectName": "rustlings",
+  "projectOwner": "fmoko",
+  "repoType": "github",
+  "repoHost": "https://github.com",
+  "skipCi": true
+}
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,7 @@
 target/
 **/*.rs.bk
 .DS_Store
+*.pdb
+exercises/clippy/Cargo.toml
+exercises/clippy/Cargo.lock
+.idea
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +0,0 @@
-language: rust
-rust:
-  - stable
-  - beta
-  - nightly
-script: cargo test --verbose
-matrix:
-  allow_failures:
-    - rust: nightly
-  fast_finish: true
-cache: cargo
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,79 @@
+<a name="4.0.0"></a>
+## 4.0.0 (2020-07-08)
+
+#### Breaking Changes
+
+*   Add a --nocapture option to display test harnesses' outputs ([8ad5f9bf](https://github.com/rust-lang/rustlings/commit/8ad5f9bf531a4848b1104b7b389a20171624c82f)
+*   Rename test to quiz, fixes #244 ([010a0456](https://github.com/rust-lang/rustlings/commit/010a04569282149cea7f7a76fc4d7f4c9f0f08dd)
+
+#### Features
+
+*   Add traits README ([173bb141](https://github.com/rust-lang/rustlings/commit/173bb14140c5530cbdb59e53ace3991a99d804af))
+*   Add box1.rs exercise ([7479a473](https://github.com/rust-lang/rustlings/commit/7479a4737bdcac347322ad0883ca528c8675e720))
+*   Rewrite try_from_into (#393) ([763aa6e3](https://github.com/rust-lang/rustlings/commit/763aa6e378a586caae2d8d63755a85eeba227933))
+*   Add if2 exercise ([1da84b5f](https://github.com/rust-lang/rustlings/commit/1da84b5f7c489f65bd683c244f13c7d1ee812df0))
+*   Added exercise structs3.rs ([b66e2e09](https://github.com/rust-lang/rustlings/commit/b66e2e09622243e086a0f1258dd27e1a2d61c891))
+*   Add exercise variables6 covering const (#352) ([5999acd2](https://github.com/rust-lang/rustlings/commit/5999acd24a4f203292be36e0fd18d385887ec481))
+
+#### Bug Fixes
+
+*   Change then to than ([ddd98ad7](https://github.com/rust-lang/rustlings/commit/ddd98ad75d3668fbb10eff74374148aa5ed2344d))
+*   rename quiz1 to tests1 in info (#420) ([0dd1c6ca](https://github.com/rust-lang/rustlings/commit/0dd1c6ca6b389789e0972aa955fe17aa15c95f29))
+*   fix quiz naming inconsistency (#421) ([5563adbb](https://github.com/rust-lang/rustlings/commit/5563adbb890587fc48fbbc9c4028642687f1e85b))
+*   confine the user further in variable exercises ([06ef4cc6](https://github.com/rust-lang/rustlings/commit/06ef4cc654e75d22a526812919ee49b8956280bf))
+*   update iterator and macro text for typos and clarity ([95900828](https://github.com/rust-lang/rustlings/commit/959008284834bece0196a01e17ac69a7e3590116))
+*   update generics2       closes #362 ([964c974a](https://github.com/rust-lang/rustlings/commit/964c974a0274199d755073b917c2bc5da0c9b4f1))
+*   confusing comment in conversions/try_from_into.rs ([c9e4f2cf](https://github.com/rust-lang/rustlings/commit/c9e4f2cfb4c48d0b7451263cfb43b9426438122d))
+* **arc1:**  Passively introduce attributes (#429) ([113cdae2](https://github.com/rust-lang/rustlings/commit/113cdae2d4e4c55905e8056ad326ede7fd7de356))
+* **box1:**  fix comment typo (#426) ([bb2ca251](https://github.com/rust-lang/rustlings/commit/bb2ca251106b27a7272d9a30872904dd1376654c))
+* **errorsn:**  Try harder to confine the user. (#388) ([2b20c8a0](https://github.com/rust-lang/rustlings/commit/2b20c8a0f5774d07c58d110d75879f33fc6273b5))
+* **from_into.rs:**  typo ([a901499e](https://github.com/rust-lang/rustlings/commit/a901499ededd3ce1995164700514fe4e9a0373ea))
+* **generics2:**  Guide students to the answer (#430) ([e6bd8021](https://github.com/rust-lang/rustlings/commit/e6bd8021d9a7dd06feebc30c9d5f953901d7b419))
+* **installation:**
+  *  Provide a backup git reference when tag can't be curl ([9e4fb100](https://github.com/rust-lang/rustlings/commit/9e4fb1009f1c9e3433915c03e22c2af422e5c5fe))
+  *  Check if python is available while checking for git,rustc and cargo ([9cfb617d](https://github.com/rust-lang/rustlings/commit/9cfb617d5b0451b4b51644a1298965390cda9884))
+* **option1:**
+  *  Don't add only zeros to the numbers array ([cce6a442](https://github.com/rust-lang/rustlings/commit/cce6a4427718724a9096800754cd3abeca6a1580))
+  *  Add cast to usize, as it is confusing in the context of an exercise about Option ([f6cffc7e](https://github.com/rust-lang/rustlings/commit/f6cffc7e487b42f15a6f958e49704c93a8d4465b))
+* **option2:**  Add TODO to comments (#400) ([10967bce](https://github.com/rust-lang/rustlings/commit/10967bce57682812dc0891a9f9757da1a9d87404))
+* **options1:**  Add hint about Array Initialization (#389) ([9f75554f](https://github.com/rust-lang/rustlings/commit/9f75554f2a30295996f03f0160b98c0458305502))
+* **test2:**  name of type String and &str (#394) ([d6c0a688](https://github.com/rust-lang/rustlings/commit/d6c0a688e6a96f93ad60d540d4b326f342fc0d45))
+* **variables6:**  minor typo (#419) ([524e17df](https://github.com/rust-lang/rustlings/commit/524e17df10db95f7b90a0f75cc8997182a8a4094))
+
+<a name="3.0.0"></a>
+## 3.0.0 (2020-04-11)
+
+#### Breaking Changes
+
+* make "compile" exercises print output (#278) ([3b6d5c](https://github.com/fmoko/rustlings/commit/3b6d5c3aaa27a242a832799eb66e96897d26fde3))
+
+#### Bug Fixes
+
+* **primitive_types:** revert primitive_types4 (#296) ([b3a3351e](https://github.com/rust-lang/rustlings/commit/b3a3351e8e6a0bdee07077d7b0382953821649ae))
+* **run:**  compile clippy exercise files (#295) ([3ab084a4](https://github.com/rust-lang/rustlings/commit/3ab084a421c0f140ae83bf1fc3f47b39342e7373))
+* **conversions:**
+  * add additional test to meet exercise rules (#284) ([bc22ec3](https://github.com/fmoko/rustlings/commit/bc22ec382f843347333ef1301fc1bad773657f38))
+  * remove duplicate not done comment (#292) ([dab90f](https://github.com/fmoko/rustlings/commit/dab90f7b91a6000fe874e3d664f244048e5fa342))
+* don't hardcode documentation version for traits (#288) ([30e6af](https://github.com/fmoko/rustlings/commit/30e6af60690c326fb5d3a9b7335f35c69c09137d))
+
+#### Features
+
+*   add Option2 exercise (#290) ([86b5c08b](https://github.com/rust-lang/rustlings/commit/86b5c08b9bea1576127a7c5f599f5752072c087d))
+*   add excercise for option (#282) ([135e5d47](https://github.com/rust-lang/rustlings/commit/135e5d47a7c395aece6f6022117fb20c82f2d3d4))
+*   add new exercises for generics (#280) ([76be5e4e](https://github.com/rust-lang/rustlings/commit/76be5e4e991160f5fd9093f03ee2ba260e8f7229))
+* **ci:**  add buildkite config ([b049fa2c](https://github.com/rust-lang/rustlings/commit/b049fa2c84dba0f0c8906ac44e28fd45fba51a71))
+
+<a name="2.2.1"></a>
+### 2.2.1 (2020-02-27)
+
+#### Bug Fixes
+
+*   Re-add cloning the repo to install scripts ([3d9b03c5](https://github.com/rust-lang/rustlings/commit/3d9b03c52b8dc51b140757f6fd25ad87b5782ef5))
+
+#### Features
+
+*   Add clippy lints (#269) ([1e2fd9c9](https://github.com/rust-lang/rustlings/commit/1e2fd9c92f8cd6e389525ca1a999fca4c90b5921))
+
 <a name="2.2.0"></a>
 ## 2.2.0 (2020-02-25)

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -592,7 +592,7 @@ dependencies = [

 [[package]]
 name = "rustlings"
-version = "2.2.0"
+version = "3.0.0"
 dependencies = [
 "assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "rustlings"
-version = "2.2.0"
-authors = ["Marisa <mokou@posteo.de>", "Carol (Nichols || Goulding) <carol.nichols@gmail.com"]
+version = "4.0.0"
+authors = ["Marisa <mokou@posteo.de>", "Carol (Nichols || Goulding) <carol.nichols@gmail.com>"]
 edition = "2018"

 [dependencies]
--- a/README.md
+++ b/README.md
@@ -1,6 +1,9 @@
 ![crab pet](https://i.imgur.com/LbZJgmm.gif)
+<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+[![All Contributors](https://img.shields.io/badge/all_contributors-48-orange.svg?style=flat-square)](#contributors-)
+<!-- ALL-CONTRIBUTORS-BADGE:END -->

-# rustlings 🦀❤️
+# rustlings 🦀❤️ [![Build status](https://badge.buildkite.com/7af93d81dc522c67a1ec8e33ff5705861b1cb36360b774807f.svg)](https://buildkite.com/mokou/rustlings)

 Greetings and welcome to `rustlings`. This project contains small exercises to get you used to reading and writing Rust code. This includes reading and responding to compiler messages!

@@ -15,8 +18,6 @@ Alternatively, for a first-time Rust learner, there's several other resources:

 _Note: If you're on MacOS, make sure you've installed Xcode and its developer tools by typing `xcode-select --install`._

-_Note: If you have Xcode 10+ installed, you also need to install the package file found at `/Library/Developer/CommandLineTools/Packages/macOS_SDK_headers_for_macOS_10.14.pkg`._
-
 You will need to have Rust installed. You can get it by visiting https://rustup.rs. This'll also install Cargo, Rust's package/project manager.

 ## MacOS/Linux
@@ -33,7 +34,7 @@ This will install Rustlings and give you access to the `rustlings` command. Run

 ## Windows

-First, set `ExecutionPolicy` to `RemoteSigned`:
+In PowerShell, set `ExecutionPolicy` to `RemoteSigned`:

 ```ps
 Set-ExecutionPolicy RemoteSigned
@@ -42,7 +43,7 @@ Set-ExecutionPolicy RemoteSigned
 Then, you can run:

 ```ps
-Invoke-WebRequest https://git.io/rustlings-win | Select-Object -ExpandProperty Content | Out-File $env:TMP/install_rustlings.ps1; Unblock-File $env:TMP/install_rustlings.ps1; Invoke-Expression $env:TMP/install_rustlings.ps1
+Start-BitsTransfer -Source https://git.io/rustlings-win -Destination $env:TMP/install_rustlings.ps1; Unblock-File $env:TMP/install_rustlings.ps1; Invoke-Expression $env:TMP/install_rustlings.ps1
 ```

 To install Rustlings. Same as on MacOS/Linux, you will have access to the `rustlings` command after it.
@@ -54,7 +55,7 @@ Basically: Clone the repository, checkout to the latest tag, run `cargo install`
 ```bash
 git clone https://github.com/rust-lang/rustlings
 cd rustlings
-git checkout tags/2.2.0 # or whatever the latest version is (find out at https://github.com/rust-lang/rustlings/releases/latest)
+git checkout tags/4.0.0 # or whatever the latest version is (find out at https://github.com/rust-lang/rustlings/releases/latest)
 cargo install --force --path .
 ```

@@ -98,7 +99,7 @@ rustlings hint myExercise1

 ## Testing yourself

-After every couple of sections, there will be a test that'll test your knowledge on a bunch of sections at once. These tests are found in `exercises/testN.rs`.
+After every couple of sections, there will be a quiz that'll test your knowledge on a bunch of sections at once. These quizzes are found in `exercises/quizN.rs`.

 ## Completion

@@ -122,7 +123,78 @@ If you are interested in improving or adding new ones, please feel free to contr

 See [CONTRIBUTING.md](./CONTRIBUTING.md).

-## Credits
+## Contributors ✨

-`rustlings` was originally written by [Carol](https://github.com/carols10cents)!
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):

+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tr>
+    <td align="center"><a href="http://carol-nichols.com"><img src="https://avatars2.githubusercontent.com/u/193874?v=4" width="100px;" alt=""/><br /><sub><b>Carol (Nichols &#124;&#124; Goulding)</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=carols10cents" title="Code">💻</a> <a href="#content-carols10cents" title="Content">🖋</a></td>
+    <td align="center"><a href="https://twitter.com/QuietMisdreavus"><img src="https://avatars2.githubusercontent.com/u/5217170?v=4" width="100px;" alt=""/><br /><sub><b>QuietMisdreavus</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=QuietMisdreavus" title="Code">💻</a> <a href="#content-QuietMisdreavus" title="Content">🖋</a></td>
+    <td align="center"><a href="https://github.com/robertlugg"><img src="https://avatars0.githubusercontent.com/u/6054540?v=4" width="100px;" alt=""/><br /><sub><b>Robert M Lugg</b></sub></a><br /><a href="#content-robertlugg" title="Content">🖋</a></td>
+    <td align="center"><a href="https://hynek.me/about/"><img src="https://avatars3.githubusercontent.com/u/41240?v=4" width="100px;" alt=""/><br /><sub><b>Hynek Schlawack</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=hynek" title="Code">💻</a></td>
+    <td align="center"><a href="https://spacekookie.de"><img src="https://avatars0.githubusercontent.com/u/7669898?v=4" width="100px;" alt=""/><br /><sub><b>Katharina Fey</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=spacekookie" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/lukabavdaz"><img src="https://avatars0.githubusercontent.com/u/9624558?v=4" width="100px;" alt=""/><br /><sub><b>lukabavdaz</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=lukabavdaz" title="Code">💻</a> <a href="#content-lukabavdaz" title="Content">🖋</a></td>
+    <td align="center"><a href="http://vestera.as"><img src="https://avatars2.githubusercontent.com/u/4187449?v=4" width="100px;" alt=""/><br /><sub><b>Erik Vesteraas</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=evestera" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Delet0r"><img src="https://avatars1.githubusercontent.com/u/23195618?v=4" width="100px;" alt=""/><br /><sub><b>delet0r</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=Delet0r" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="http://phinary.ca"><img src="https://avatars1.githubusercontent.com/u/10522375?v=4" width="100px;" alt=""/><br /><sub><b>Shaun Bennett</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=shaunbennett" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/abagshaw"><img src="https://avatars2.githubusercontent.com/u/8594541?v=4" width="100px;" alt=""/><br /><sub><b>Andrew Bagshaw</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=abagshaw" title="Code">💻</a></td>
+    <td align="center"><a href="https://ai6ua.net/"><img src="https://avatars2.githubusercontent.com/u/175578?v=4" width="100px;" alt=""/><br /><sub><b>Kyle Isom</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=kisom" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/ColinPitrat"><img src="https://avatars3.githubusercontent.com/u/1541863?v=4" width="100px;" alt=""/><br /><sub><b>Colin Pitrat</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=ColinPitrat" title="Code">💻</a></td>
+    <td align="center"><a href="https://zacanger.com"><img src="https://avatars3.githubusercontent.com/u/12520493?v=4" width="100px;" alt=""/><br /><sub><b>Zac Anger</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=zacanger" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/mgeier"><img src="https://avatars1.githubusercontent.com/u/705404?v=4" width="100px;" alt=""/><br /><sub><b>Matthias Geier</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=mgeier" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/cjpearce"><img src="https://avatars1.githubusercontent.com/u/3453268?v=4" width="100px;" alt=""/><br /><sub><b>Chris Pearce</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=cjpearce" title="Code">💻</a></td>
+    <td align="center"><a href="https://yvan-sraka.github.io"><img src="https://avatars2.githubusercontent.com/u/705213?v=4" width="100px;" alt=""/><br /><sub><b>Yvan Sraka</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=yvan-sraka" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/dendi239"><img src="https://avatars3.githubusercontent.com/u/16478650?v=4" width="100px;" alt=""/><br /><sub><b>Denys Smirnov</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=dendi239" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/eddyp"><img src="https://avatars2.githubusercontent.com/u/123772?v=4" width="100px;" alt=""/><br /><sub><b>eddyp</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=eddyp" title="Code">💻</a></td>
+    <td align="center"><a href="http://about.me/BrianKung"><img src="https://avatars1.githubusercontent.com/u/2836167?v=4" width="100px;" alt=""/><br /><sub><b>Brian Kung</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=briankung" title="Code">💻</a> <a href="#content-briankung" title="Content">🖋</a></td>
+    <td align="center"><a href="https://rcousineau.gitlab.io"><img src="https://avatars3.githubusercontent.com/u/281039?v=4" width="100px;" alt=""/><br /><sub><b>Russell</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=miller-time" title="Code">💻</a></td>
+    <td align="center"><a href="http://danwilhelm.com"><img src="https://avatars3.githubusercontent.com/u/6137185?v=4" width="100px;" alt=""/><br /><sub><b>Dan Wilhelm</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=danwilhelm" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/Jesse-Cameron"><img src="https://avatars3.githubusercontent.com/u/3723654?v=4" width="100px;" alt=""/><br /><sub><b>Jesse</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=Jesse-Cameron" title="Code">💻</a> <a href="#content-Jesse-Cameron" title="Content">🖋</a></td>
+    <td align="center"><a href="https://github.com/MrFroop"><img src="https://avatars3.githubusercontent.com/u/196700?v=4" width="100px;" alt=""/><br /><sub><b>Fredrik Jambrén</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=MrFroop" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/petemcfarlane"><img src="https://avatars3.githubusercontent.com/u/3472717?v=4" width="100px;" alt=""/><br /><sub><b>Pete McFarlane</b></sub></a><br /><a href="#content-petemcfarlane" title="Content">🖋</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/nkanderson"><img src="https://avatars0.githubusercontent.com/u/4128825?v=4" width="100px;" alt=""/><br /><sub><b>nkanderson</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=nkanderson" title="Code">💻</a> <a href="#content-nkanderson" title="Content">🖋</a></td>
+    <td align="center"><a href="https://github.com/ajaxm"><img src="https://avatars0.githubusercontent.com/u/13360138?v=4" width="100px;" alt=""/><br /><sub><b>Ajax M</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=ajaxm" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://dylnuge.com"><img src="https://avatars2.githubusercontent.com/u/118624?v=4" width="100px;" alt=""/><br /><sub><b>Dylan Nugent</b></sub></a><br /><a href="#content-Dylnuge" title="Content">🖋</a></td>
+    <td align="center"><a href="https://github.com/vyaslav"><img src="https://avatars0.githubusercontent.com/u/1385427?v=4" width="100px;" alt=""/><br /><sub><b>vyaslav</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=vyaslav" title="Code">💻</a> <a href="#content-vyaslav" title="Content">🖋</a></td>
+    <td align="center"><a href="https://join.sfxd.org"><img src="https://avatars1.githubusercontent.com/u/17297466?v=4" width="100px;" alt=""/><br /><sub><b>George</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=gdoenlen" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/nyxtom"><img src="https://avatars2.githubusercontent.com/u/222763?v=4" width="100px;" alt=""/><br /><sub><b>Thomas Holloway</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=nyxtom" title="Code">💻</a> <a href="#content-nyxtom" title="Content">🖋</a></td>
+    <td align="center"><a href="https://github.com/workingjubilee"><img src="https://avatars1.githubusercontent.com/u/46493976?v=4" width="100px;" alt=""/><br /><sub><b>Jubilee</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=workingjubilee" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/WofWca"><img src="https://avatars1.githubusercontent.com/u/39462442?v=4" width="100px;" alt=""/><br /><sub><b>WofWca</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=WofWca" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/jrvidal"><img src="https://avatars0.githubusercontent.com/u/1636604?v=4" width="100px;" alt=""/><br /><sub><b>Roberto Vidal</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=jrvidal" title="Code">💻</a> <a href="https://github.com/fmoko/rustlings/commits?author=jrvidal" title="Documentation">📖</a> <a href="#ideas-jrvidal" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-jrvidal" title="Maintenance">🚧</a></td>
+    <td align="center"><a href="https://github.com/jensim"><img src="https://avatars0.githubusercontent.com/u/3663856?v=4" width="100px;" alt=""/><br /><sub><b>Jens</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=jensim" title="Documentation">📖</a></td>
+    <td align="center"><a href="http://rahatah.me/d"><img src="https://avatars3.githubusercontent.com/u/3174006?v=4" width="100px;" alt=""/><br /><sub><b>Rahat Ahmed</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=rahatarmanahmed" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/AbdouSeck"><img src="https://avatars2.githubusercontent.com/u/6490055?v=4" width="100px;" alt=""/><br /><sub><b>Abdou Seck</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=AbdouSeck" title="Code">💻</a> <a href="#content-AbdouSeck" title="Content">🖋</a> <a href="https://github.com/fmoko/rustlings/pulls?q=is%3Apr+reviewed-by%3AAbdouSeck" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://codehearts.com"><img src="https://avatars0.githubusercontent.com/u/2885412?v=4" width="100px;" alt=""/><br /><sub><b>Katie</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=codehearts" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Socratides"><img src="https://avatars3.githubusercontent.com/u/27732983?v=4" width="100px;" alt=""/><br /><sub><b>Socrates</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=Socratides" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/gnodarse"><img src="https://avatars3.githubusercontent.com/u/46761795?v=4" width="100px;" alt=""/><br /><sub><b>gnodarse</b></sub></a><br /><a href="#content-gnodarse" title="Content">🖋</a></td>
+    <td align="center"><a href="https://github.com/harrisonmetz"><img src="https://avatars1.githubusercontent.com/u/7883408?v=4" width="100px;" alt=""/><br /><sub><b>Harrison Metzger</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=harrisonmetz" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/TorbenJ"><img src="https://avatars2.githubusercontent.com/u/9077102?v=4" width="100px;" alt=""/><br /><sub><b>Torben Jonas</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=TorbenJ" title="Code">💻</a> <a href="#content-TorbenJ" title="Content">🖋</a></td>
+    <td align="center"><a href="http://paulbissex.com/"><img src="https://avatars0.githubusercontent.com/u/641?v=4" width="100px;" alt=""/><br /><sub><b>Paul Bissex</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=pbx" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/sjmann"><img src="https://avatars0.githubusercontent.com/u/6589896?v=4" width="100px;" alt=""/><br /><sub><b>Steven Mann</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=sjmann" title="Code">💻</a> <a href="#content-sjmann" title="Content">🖋</a></td>
+    <td align="center"><a href="https://smmdb.net/"><img src="https://avatars2.githubusercontent.com/u/5855071?v=4" width="100px;" alt=""/><br /><sub><b>Mario Reder</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=Tarnadas" title="Code">💻</a> <a href="#content-Tarnadas" title="Content">🖋</a></td>
+    <td align="center"><a href="https://keybase.io/skim"><img src="https://avatars0.githubusercontent.com/u/47347?v=4" width="100px;" alt=""/><br /><sub><b>skim</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=sl4m" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/sanjaykdragon"><img src="https://avatars1.githubusercontent.com/u/10261698?v=4" width="100px;" alt=""/><br /><sub><b>Sanjay K</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=sanjaykdragon" title="Code">💻</a> <a href="#content-sanjaykdragon" title="Content">🖋</a></td>
+    <td align="center"><a href="http://www.rohanjain.in"><img src="https://avatars1.githubusercontent.com/u/343499?v=4" width="100px;" alt=""/><br /><sub><b>Rohan Jain</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=crodjer" title="Code">💻</a></td>
+    <td align="center"><a href="https://www.saidaspen.se"><img src="https://avatars1.githubusercontent.com/u/7727687?v=4" width="100px;" alt=""/><br /><sub><b>Said Aspen</b></sub></a><br /><a href="https://github.com/fmoko/rustlings/commits?author=saidaspen" title="Code">💻</a> <a href="#content-saidaspen" title="Content">🖋</a></td>
+  </tr>
+</table>
+
+<!-- markdownlint-enable -->
+<!-- prettier-ignore-end -->
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
--- a/buildkite.yml
+++ b/buildkite.yml
@@ -0,0 +1,5 @@
+steps:
+  - label: "Test with stable"
+    command: rustup run stable cargo test
+  - label: "Test with beta"
+    command: rustup run beta cargo test
--- a/exercises/clippy/README.md
+++ b/exercises/clippy/README.md
@@ -0,0 +1,8 @@
+### Clippy
+
+The Clippy tool is a collection of lints to analyze your code so you can catch common mistakes and improve your Rust code.
+
+If you used the installation script for Rustlings, Clippy should be already installed.
+If not you can install it manually via `rustup component add clippy`.
+
+For more information about Clippy lints, please see [their documentation page](https://rust-lang.github.io/rust-clippy/master/).
--- a/exercises/clippy/clippy1.rs
+++ b/exercises/clippy/clippy1.rs
@@ -0,0 +1,17 @@
+// clippy1.rs
+// The Clippy tool is a collection of lints to analyze your code
+// so you can catch common mistakes and improve your Rust code.
+//
+// For these exercises the code will fail to compile when there are clippy warnings
+// check clippy's suggestions from the output to solve the exercise.
+// Execute `rustlings hint clippy1` for hints :)
+
+// I AM NOT DONE
+
+fn main() {
+    let x = 1.2331f64;
+    let y = 1.2332f64;
+    if y != x {
+        println!("Success!");
+    }
+}
--- a/exercises/clippy/clippy2.rs
+++ b/exercises/clippy/clippy2.rs
@@ -0,0 +1,13 @@
+// clippy2.rs
+// Make me compile! Execute `rustlings hint clippy2` for hints :)
+
+// I AM NOT DONE
+
+fn main() {
+    let mut res = 42;
+    let option = Some(12);
+    for x in option {
+        res += x;
+    }
+    println!("{}", res);
+}
--- a/exercises/conversions/as_ref_mut.rs
+++ b/exercises/conversions/as_ref_mut.rs
@@ -9,7 +9,6 @@ fn byte_counter<T>(arg: T) -> usize {
    arg.as_ref().as_bytes().len()
 }

-// I AM NOT DONE
 // Obtain the number of characters (not bytes) in the given argument
 // Add the AsRef trait appropriately as a trait bound
 fn char_counter<T>(arg: T) -> usize {
@@ -37,4 +36,16 @@ mod tests {
        let s = "Cafe au lait";
        assert_eq!(char_counter(s), byte_counter(s));
    }
+
+    #[test]
+    fn different_counts_using_string() {
+        let s = String::from("Café au lait");
+        assert_ne!(char_counter(s.clone()), byte_counter(s));
+    }
+
+    #[test]
+    fn same_counts_using_string() {
+        let s = String::from("Cafe au lait");
+        assert_eq!(char_counter(s.clone()), byte_counter(s));
+    }
 }
--- a/exercises/conversions/from_into.rs
+++ b/exercises/conversions/from_into.rs
@@ -29,9 +29,10 @@ impl Default for Person {
 // 1. If the length of the provided string is 0, then return the default of Person
 // 2. Split the given string on the commas present in it
 // 3. Extract the first element from the split operation and use it as the name
-// 4. Extract the other element from the split operation and parse it into a `usize` as the age
+// 4. If the name is empty, then return the default of Person
+// 5. Extract the other element from the split operation and parse it into a `usize` as the age
 // If while parsing the age, something goes wrong, then return the default of Person
-// Otherwise, then return an instantiated Person onject with the results
+// Otherwise, then return an instantiated Person object with the results
 impl From<&str> for Person {
    fn from(s: &str) -> Person {
    }
@@ -70,4 +71,46 @@ mod tests {
        assert_eq!(p.name, "Mark");
        assert_eq!(p.age, 20);
    }
+    #[test]
+    fn test_bad_age() {
+        // Test that "Mark.twenty" will return the default person due to an error in parsing age
+        let p = Person::from("Mark,twenty");
+        assert_eq!(p.name, "John");
+        assert_eq!(p.age, 30);
+    }
+
+    #[test]
+    fn test_missing_comma_and_age() {
+        let p: Person = Person::from("Mark");
+        assert_eq!(p.name, "John");
+        assert_eq!(p.age, 30);
+    }
+
+    #[test]
+    fn test_missing_age() {
+        let p: Person = Person::from("Mark,");
+        assert_eq!(p.name, "John");
+        assert_eq!(p.age, 30);
+    }
+
+    #[test]
+    fn test_missing_name() {
+        let p: Person = Person::from(",1");
+        assert_eq!(p.name, "John");
+        assert_eq!(p.age, 30);
+    }
+
+    #[test]
+    fn test_missing_name_and_age() {
+        let p: Person = Person::from(",");
+        assert_eq!(p.name, "John");
+        assert_eq!(p.age, 30);
+    }
+
+    #[test]
+    fn test_missing_name_and_invalid_age() {
+        let p: Person = Person::from(",one");
+        assert_eq!(p.name, "John");
+        assert_eq!(p.age, 30);
+    }
 }
--- a/exercises/conversions/from_str.rs
+++ b/exercises/conversions/from_str.rs
@@ -15,7 +15,9 @@ struct Person {
 // 1. If the length of the provided string is 0, then return an error
 // 2. Split the given string on the commas present in it
 // 3. Extract the first element from the split operation and use it as the name
-// 4. Extract the other element from the split operation and parse it into a `usize` as the age
+// 4. If the name is empty, then return an error
+// 5. Extract the other element from the split operation and parse it into a `usize` as the age
+//    with something like `"4".parse::<usize>()`.
 // If while parsing the age, something goes wrong, then return an error
 // Otherwise, then return a Result of a Person object
 impl FromStr for Person {
@@ -39,11 +41,46 @@ mod tests {
    }
    #[test]
    fn good_input() {
-        assert!("John,32".parse::<Person>().is_ok());
+        let p = "John,32".parse::<Person>();
+        assert!(p.is_ok());
+        let p = p.unwrap();
+        assert_eq!(p.name, "John");
+        assert_eq!(p.age, 32);
    }
    #[test]
    #[should_panic]
    fn missing_age() {
+        "John,".parse::<Person>().unwrap();
+    }
+
+    #[test]
+    #[should_panic]
+    fn invalid_age() {
+        "John,twenty".parse::<Person>().unwrap();
+    }
+
+    #[test]
+    #[should_panic]
+    fn missing_comma_and_age() {
        "John".parse::<Person>().unwrap();
    }
-}
+
+    #[test]
+    #[should_panic]
+    fn missing_name() {
+        ",1".parse::<Person>().unwrap();
+    }
+
+    #[test]
+    #[should_panic]
+    fn missing_name_and_age() {
+        ",".parse::<Person>().unwrap();
+    }
+
+    #[test]
+    #[should_panic]
+    fn missing_name_and_invalid_age() {
+        ",one".parse::<Person>().unwrap();
+    }
+
+}
--- a/exercises/conversions/try_from_into.rs
+++ b/exercises/conversions/try_from_into.rs
@@ -5,67 +5,126 @@
 use std::convert::{TryInto, TryFrom};

 #[derive(Debug)]
-struct Person {
-    name: String,
-    age: usize,
+struct Color {
+    red: u8,
+    green: u8,
+    blue: u8,
 }

 // I AM NOT DONE
+
 // Your task is to complete this implementation
-// in order for the line `let p = Person::try_from("Mark,20")` to compile
-// and return an Ok result of inner type Person.
-// Please note that you'll need to parse the age component into a `usize`
-// with something like `"4".parse::<usize>()`. The outcome of this needs to
-// be handled appropriately.
+// and return an Ok result of inner type Color.
+// You need create implementation for a tuple of three integer,
+// an array of three integer and slice of integer.
 //
-// Steps:
-// 1. If the length of the provided string is 0, then return an error
-// 2. Split the given string on the commas present in it
-// 3. Extract the first element from the split operation and use it as the name
-// 4. Extract the other element from the split operation and parse it into a `usize` as the age
-// If while parsing the age, something goes wrong, then return an error
-// Otherwise, then return a Result of a Person object
-impl TryFrom<&str> for Person {
+// Note, that implementation for tuple and array will be checked at compile-time,
+// but slice implementation need check slice length!
+// Also note, that chunk of correct rgb color must be integer in range 0..=255.
+
+// Tuple implementation
+impl TryFrom<(i16, i16, i16)> for Color {
    type Error = String;
-    fn try_from(s: &str) -> Result<Self, Self::Error> {
+    fn try_from(tuple: (i16, i16, i16)) -> Result<Self, Self::Error> {
+    }
+}
+
+// Array implementation
+impl TryFrom<[i16; 3]> for Color {
+    type Error = String;
+    fn try_from(arr: [i16; 3]) -> Result<Self, Self::Error> {
+    }
+}
+
+// Slice implementation
+impl TryFrom<&[i16]> for Color {
+    type Error = String;
+    fn try_from(slice: &[i16]) -> Result<Self, Self::Error> {
    }
 }

 fn main() {
    // Use the `from` function
-    let p1 = Person::try_from("Mark,20");
-    // Since From is implemented for Person, we should be able to use Into
-    let p2: Result<Person, _> = "Gerald,70".try_into();
-    println!("{:?}", p1);
-    println!("{:?}", p2);
+    let c1 = Color::try_from((183, 65, 14));
+    println!("{:?}", c1);
+
+    // Since From is implemented for Color, we should be able to use Into
+    let c2: Result<Color, _> = [183, 65, 14].try_into();
+    println!("{:?}", c2);
+
+    let v = vec![183, 65, 14];
+    // With slice we should use `from` function
+    let c3 = Color::try_from(&v[..]);
+    println!("{:?}", c3);
+    // or take slice within round brackets and use Into
+    let c4: Result<Color, _> = (&v[..]).try_into();
+    println!("{:?}", c4);
 }

 #[cfg(test)]
 mod tests {
    use super::*;
+
    #[test]
-    fn test_bad_convert() {
-        // Test that John is returned when bad string is provided
-        let p = Person::try_from("");
-        assert!(p.is_err());
-    }
-    #[test]
-    fn test_good_convert() {
-        // Test that "Mark,20" works
-        let p = Person::try_from("Mark,20");
-        assert!(p.is_ok());
-        let p = p.unwrap();
-        assert_eq!(p.name, "Mark");
-        assert_eq!(p.age, 20);
+    #[should_panic]
+    fn test_tuple_out_of_range_positive() {
+        let _ = Color::try_from((256, 1000, 10000)).unwrap();
    }
    #[test]
    #[should_panic]
-    fn test_panic_empty_input() {
-        let p: Person = "".try_into().unwrap();
+    fn test_tuple_out_of_range_negative() {
+        let _ = Color::try_from((-1, -10, -256)).unwrap();
+    }
+    #[test]
+    fn test_tuple_correct() {
+        let c: Color = (183, 65, 14).try_into().unwrap();
+        assert_eq!(c.red, 183);
+        assert_eq!(c.green, 65);
+        assert_eq!(c.blue, 14);
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_array_out_of_range_positive() {
+        let _: Color = [1000, 10000, 256].try_into().unwrap();
    }
    #[test]
    #[should_panic]
-    fn test_panic_bad_age() {
-        let p = Person::try_from("Mark,twenty").unwrap();
+    fn test_array_out_of_range_negative() {
+        let _: Color = [-10, -256, -1].try_into().unwrap();
    }
-}
+    #[test]
+    fn test_array_correct() {
+        let c: Color = [183, 65, 14].try_into().unwrap();
+        assert_eq!(c.red, 183);
+        assert_eq!(c.green, 65);
+        assert_eq!(c.blue, 14);
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_slice_out_of_range_positive() {
+        let arr = [10000, 256, 1000];
+        let _ = Color::try_from(&arr[..]).unwrap();
+    }
+    #[test]
+    #[should_panic]
+    fn test_slice_out_of_range_negative() {
+        let arr = [-256, -1, -10];
+        let _ = Color::try_from(&arr[..]).unwrap();
+    }
+    #[test]
+    fn test_slice_correct() {
+        let v = vec![183, 65, 14];
+        let c = Color::try_from(&v[..]).unwrap();
+        assert_eq!(c.red, 183);
+        assert_eq!(c.green, 65);
+        assert_eq!(c.blue, 14);
+    }
+    #[test]
+    #[should_panic]
+    fn test_slice_excess_length() {
+        let v = vec![0, 0, 0, 0];
+        let _ = Color::try_from(&v[..]).unwrap();
+    }
+}
--- a/exercises/enums/enums3.rs
+++ b/exercises/enums/enums3.rs
@@ -53,7 +53,7 @@ mod tests {
        };
        state.process(Message::ChangeColor(255, 0, 255));
        state.process(Message::Echo(String::from("hello world")));
-        state.process(Message::Move{ x: 10, y: 15 });
+        state.process(Message::Move(Point{ x: 10, y: 15 }));
        state.process(Message::Quit);

        assert_eq!(state.color, (255, 0, 255));
--- a/exercises/error_handling/errorsn.rs
+++ b/exercises/error_handling/errorsn.rs
@@ -2,8 +2,10 @@
 // This is a bigger error exercise than the previous ones!
 // You can do it! :)
 //
-// Edit the `read_and_validate` function so that it compiles and
-// passes the tests... so many things could go wrong!
+// Edit the `read_and_validate` function ONLY. Don't create any Errors
+// that do not already exist.
+//
+// So many things could go wrong!
 //
 // - Reading from stdin could produce an io::Error
 // - Parsing the input could produce a num::ParseIntError
@@ -30,6 +32,10 @@ fn read_and_validate(b: &mut dyn io::BufRead) -> Result<PositiveNonzeroInteger,
    answer
 }

+//
+// Nothing below this needs to be modified
+//
+
 // This is a test helper function that turns a &str into a BufReader.
 fn test_with_str(s: &str) -> Result<PositiveNonzeroInteger, Box<dyn error::Error>> {
    let mut b = io::BufReader::new(s.as_bytes());
@@ -100,15 +106,12 @@ enum CreationError {

 impl fmt::Display for CreationError {
    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str((self as &dyn error::Error).description())
+        let description = match *self {
+            CreationError::Negative => "Number is negative",
+            CreationError::Zero => "Number is zero",
+        };
+        f.write_str(description)
    }
 }

-impl error::Error for CreationError {
-    fn description(&self) -> &str {
-        match *self {
-            CreationError::Negative => "Negative",
-            CreationError::Zero => "Zero",
-        }
-    }
-}
+impl error::Error for CreationError {}
--- a/exercises/error_handling/option1.rs
+++ b/exercises/error_handling/option1.rs
@@ -1,31 +0,0 @@
-// option1.rs
-// This example panics because the second time it calls `pop`, the `vec`
-// is empty, so `pop` returns `None`, and `unwrap` panics if it's called
-// on `None`. Handle this in a more graceful way than calling `unwrap`!
-// Execute `rustlings hint option1` for hints :)
-
-// I AM NOT DONE
-
-pub fn pop_too_much() -> bool {
-    let mut list = vec![3];
-
-    let last = list.pop().unwrap();
-    println!("The last item in the list is {:?}", last);
-
-    let second_to_last = list.pop().unwrap();
-    println!(
-        "The second-to-last item in the list is {:?}",
-        second_to_last
-    );
-    true
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn should_not_panic() {
-        assert!(pop_too_much());
-    }
-}
--- a/exercises/generics/README.md
+++ b/exercises/generics/README.md
@@ -0,0 +1,7 @@
+### Generics
+
+In this section you'll learn about saving yourself many lines of code with generics!
+
+### Book Sections
+
+- [Generic Data Types](https://doc.rust-lang.org/stable/book/ch10-01-syntax.html)
--- a/exercises/generics/generics1.rs
+++ b/exercises/generics/generics1.rs
@@ -0,0 +1,10 @@
+// This shopping list program isn't compiling! 
+// Use your knowledge of generics to fix it.
+
+// I AM NOT DONE
+
+fn main() {
+    let mut shopping_list: Vec<?> = Vec::new();
+    shopping_list.push("milk");
+}
+
--- a/exercises/generics/generics2.rs
+++ b/exercises/generics/generics2.rs
@@ -0,0 +1,28 @@
+// This powerful wrapper provides the ability to store a positive integer value.
+// Rewrite it using generics so that it supports wrapping ANY type.
+
+// I AM NOT DONE
+struct Wrapper {
+    value: u32
+}
+
+impl Wrapper {
+    pub fn new(value: u32) -> Self {
+        Wrapper { value }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn store_u32_in_wrapper() {
+        assert_eq!(Wrapper::new(42).value,  42);
+    }
+
+    #[test]
+    fn store_str_in_wrapper() {
+        assert_eq!(Wrapper::new("Foo").value, "Foo");
+    }
+}
--- a/exercises/generics/generics3.rs
+++ b/exercises/generics/generics3.rs
@@ -0,0 +1,48 @@
+// An imaginary magical school has a new report card generation system written in Rust!
+// Currently the system only supports creating report cards where the student's grade 
+// is represented numerically (e.g. 1.0 -> 5.5). 
+// However, the school also issues alphabetical grades (A+ -> F-) and needs 
+// to be able to print both types of report card!
+
+// Make the necessary code changes to support alphabetical report cards, thereby making 
+// the second test pass.
+
+// I AM NOT DONE
+pub struct ReportCard {
+    pub grade: f32,
+    pub student_name: String,
+    pub student_age: u8,
+}
+
+impl ReportCard {
+    pub fn print(&self) -> String {
+        format!("{} ({}) - achieved a grade of {}", 
+            &self.student_name, &self.student_age, &self.grade)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn generate_numeric_report_card() {
+        let report_card = ReportCard {
+            grade: 2.1, 
+            student_name: "Tom Wriggle".to_string(), 
+            student_age: 12,
+        };
+        assert_eq!(report_card.print(), "Tom Wriggle (12) - achieved a grade of 2.1");
+    }
+
+    #[test]
+    fn generate_alphabetic_report_card() {
+        // TODO: Make sure to change the grade here after you finish the exercise.
+        let report_card = ReportCard {
+            grade: 2.1, 
+            student_name: "Gary Plotter".to_string(), 
+            student_age: 11,
+        };
+        assert_eq!(report_card.print(), "Gary Plotter (11) - achieved a grade of A+");
+    }
+}
--- a/exercises/if/if2.rs
+++ b/exercises/if/if2.rs
@@ -0,0 +1,36 @@
+// if2.rs
+
+// Step 1: Make me compile!
+// Step 2: Get the bar_for_fuzz and default_to_baz tests passing!
+// Execute the command `rustlings hint if2` if you want a hint :)
+
+// I AM NOT DONE
+
+pub fn fizz_if_foo(fizzish: &str) -> &str {
+    if fizzish == "fizz" {
+        "foo"
+    } else {
+        1
+    }
+}
+
+// No test changes needed!
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn foo_for_fizz() {
+        assert_eq!(fizz_if_foo("fizz"), "foo")
+    }
+
+    #[test]
+    fn bar_for_fuzz() {
+        assert_eq!(fizz_if_foo("fuzz"), "bar")
+    }
+
+    #[test]
+    fn default_to_baz() {
+        assert_eq!(fizz_if_foo("literally anything"), "baz")
+    }
+}
--- a/exercises/macros/README.md
+++ b/exercises/macros/README.md
@@ -2,7 +2,7 @@

 Rust's macro system is very powerful, but also kind of difficult to wrap your
 head around. We're not going to teach you how to write your own fully-featured
-modules, instead we'll show you how to use and create them.
+macros. Instead, we'll show you how to use and create them.

 #### Book Sections

--- a/exercises/option/README.md
+++ b/exercises/option/README.md
@@ -0,0 +1,9 @@
+### Option
+
+#### Book Sections
+
+To learn about Option<T>, check out these links:
+
+- [Option Enum Format](https://doc.rust-lang.org/stable/book/ch10-01-syntax.html#in-enum-definitions)
+- [Option Module Documentation](https://doc.rust-lang.org/std/option/)
+- [Option Enum Documentation](https://doc.rust-lang.org/std/option/enum.Option.html)
--- a/exercises/option/option1.rs
+++ b/exercises/option/option1.rs
@@ -0,0 +1,23 @@
+// option1.rs
+// Make me compile! Execute `rustlings hint option1` for hints
+
+// I AM NOT DONE
+
+// you can modify anything EXCEPT for this function's sig
+fn print_number(maybe_number: Option<u16>) {
+    println!("printing: {}", maybe_number.unwrap());
+}
+
+fn main() {
+    print_number(13);
+    print_number(99);
+
+    let mut numbers: [Option<u16>; 5];
+    for iter in 0..5 {
+        let number_to_add: u16 = {
+            ((iter * 1235) + 2) / (4 * 16)
+        };
+
+        numbers[iter as usize] = number_to_add;
+    }
+}
--- a/exercises/option/option2.rs
+++ b/exercises/option/option2.rs
@@ -0,0 +1,25 @@
+// option2.rs
+// Make me compile! Execute `rustlings hint option2` for hints
+
+// I AM NOT DONE
+
+fn main() {
+    let optional_value = Some(String::from("rustlings"));
+    // TODO: Make this an if let statement whose value is "Some" type
+    value = optional_value {
+        println!("the value of optional value is: {}", value);
+    } else {
+        println!("The optional value doesn't contain anything!");
+    }
+
+    let mut optional_values_vec: Vec<Option<i8>> = Vec::new();
+    for x in 1..10 {
+        optional_values_vec.push(Some(x));
+    }
+
+    // TODO: make this a while let statement - remember that vector.pop also adds another layer of Option<T>
+    // You can stack `Option<T>`'s into while let and if let
+    value = optional_values_vec.pop() {
+        println!("current value: {}", value);
+    }
+}
--- a/exercises/quiz1.rs
+++ b/exercises/quiz1.rs
@@ -1,5 +1,5 @@
-// test1.rs
-// This is a test for the following sections:
+// quiz1.rs
+// This is a quiz for the following sections:
 // - Variables
 // - Functions

--- a/exercises/quiz2.rs
+++ b/exercises/quiz2.rs
@@ -1,8 +1,8 @@
-// test2.rs
-// This is a test for the following sections:
+// quiz2.rs
+// This is a quiz for the following sections:
 // - Strings

-// Ok, here are a bunch of values-- some are `Strings`, some are `&strs`. Your
+// Ok, here are a bunch of values-- some are `String`s, some are `&str`s. Your
 // task is to call one of these two functions on each value depending on what
 // 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!
--- a/exercises/quiz3.rs
+++ b/exercises/quiz3.rs
@@ -1,8 +1,8 @@
-// test3.rs
-// This is a test for the following sections:
+// quiz3.rs
+// This is a quiz for the following sections:
 // - Tests

-// This test isn't testing our function -- make it do that in such a way that
+// This quiz isn't testing our function -- make it do that in such a way that
 // the test passes. Then write a second test that tests that we get the result
 // we expect to get when we call `times_two` with a negative number.
 // No hints, you can do this :)
--- a/exercises/quiz4.rs
+++ b/exercises/quiz4.rs
@@ -1,9 +1,9 @@
-// test4.rs
-// This test covers the sections:
+// quiz4.rs
+// This quiz covers the sections:
 // - Modules
 // - Macros

-// Write a macro that passes the test! No hints this time, you can do it!
+// Write a macro that passes the quiz! No hints this time, you can do it!

 // I AM NOT DONE

--- a/exercises/standard_library_types/README.md
+++ b/exercises/standard_library_types/README.md
@@ -1,3 +1,5 @@
+For the Box exercise check out the chapter [Using Box to Point to Data on the Heap](https://doc.rust-lang.org/book/ch15-01-box.html).
+
 For the Arc exercise check out the chapter [Shared-State Concurrency](https://doc.rust-lang.org/book/ch16-03-shared-state.html) of the Rust Book.

 For the Iterator exercise check out the chapters [Iterator](https://doc.rust-lang.org/book/ch13-02-iterators.html) of the Rust Book and the [Iterator documentation](https://doc.rust-lang.org/stable/std/iter/).
--- a/exercises/standard_library_types/arc1.rs
+++ b/exercises/standard_library_types/arc1.rs
@@ -6,6 +6,7 @@

 // I AM NOT DONE

+#![forbid(unused_imports)] // Do not change this, (or the next) line.
 use std::sync::Arc;
 use std::thread;

--- a/exercises/standard_library_types/box1.rs
+++ b/exercises/standard_library_types/box1.rs
@@ -0,0 +1,53 @@
+// box1.rs
+//
+// At compile time, Rust needs to know how much space a type takes up. This becomes problematic
+// for recursive types, where a value can have as part of itself another value of the same type.
+// To get around the issue, we can use a `Box` - a smart pointer used to store data on the heap,
+// which also allows us to wrap a recursive type.
+//
+// The recursive type we're implementing in this exercise is the `cons list` - a data structure
+// frequently found in functional programming languages. Each item in a cons list contains two
+// elements: the value of the current item and the next item. The last item is a value called `Nil`.
+//
+// Step 1: use a `Box` in the enum definition to make the code compile
+// Step 2: create both empty and non-empty cons lists by replacing `unimplemented!()`
+//
+// Note: the tests should not be changed
+//
+// Execute `rustlings hint box1` for hints :)
+
+// I AM NOT DONE
+
+#[derive(PartialEq, Debug)]
+pub enum List {
+    Cons(i32, List),
+    Nil,
+}
+
+fn main() {
+    println!("This is an empty cons list: {:?}", create_empty_list());
+    println!("This is a non-empty cons list: {:?}", create_non_empty_list());
+}
+
+pub fn create_empty_list() -> List {
+    unimplemented!()
+}
+
+pub fn create_non_empty_list() -> List {
+    unimplemented!()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_create_empty_list() {
+        assert_eq!(List::Nil, create_empty_list())
+    }
+
+    #[test]
+    fn test_create_non_empty_list() {
+        assert_ne!(create_empty_list(), create_non_empty_list())
+    }
+}
--- a/exercises/standard_library_types/iterators2.rs
+++ b/exercises/standard_library_types/iterators2.rs
@@ -1,8 +1,10 @@
 // iterators2.rs
-// In this module, you'll learn some of unique advantages that iterators can offer
-// Step 1. Complete the `capitalize_first` function to pass the first two cases
-// Step 2. Apply the `capitalize_first` function to a vector of strings, ensuring that it returns a vector of strings as well
-// Step 3. Apply the `capitalize_first` function again to a list, but try and ensure it returns a single string
+// In this module, you'll learn some of unique advantages that iterators can offer.
+// Step 1. Complete the `capitalize_first` function to pass the first two cases.
+// Step 2. Apply the `capitalize_first` function to a vector of strings.
+//         Ensure that it returns a vector of strings as well.
+// Step 3. Apply the `capitalize_first` function again to a list.
+//         Try to ensure it returns a single string.
 // As always, there are hints if you execute `rustlings hint iterators2`!

 // I AM NOT DONE
--- a/exercises/standard_library_types/iterators4.rs
+++ b/exercises/standard_library_types/iterators4.rs
@@ -3,13 +3,13 @@
 // I AM NOT DONE

 pub fn factorial(num: u64) -> u64 {
-    // Complete this function to return factorial of num
+    // Complete this function to return the factorial of num
    // Do not use:
    // - return
-    // For extra fun don't use:
+    // Try not to use:
    // - imperative style loops (for, while)
    // - additional variables
-    // For the most fun don't use:
+    // For an extra challenge, don't use:
    // - recursion
    // Execute `rustlings hint iterators4` for hints.
 }
--- a/exercises/structs/structs2.rs
+++ b/exercises/structs/structs2.rs
@@ -1,6 +1,5 @@
 // structs2.rs
 // Address all the TODOs to make the tests pass!
-// No hints, just do it!

 // I AM NOT DONE

--- a/exercises/structs/structs3.rs
+++ b/exercises/structs/structs3.rs
@@ -0,0 +1,67 @@
+// structs3.rs
+// Structs contain more than simply some data, they can also have logic, in this
+// exercise we have defined the Package struct and we want to test some logic attached to it,
+// make the code compile and the tests pass! If you have issues execute `rustlings hint structs3`
+
+// I AM NOT DONE
+
+#[derive(Debug)]
+struct Package {
+    sender_country: String,
+    recipient_country: String,
+    weight_in_grams: i32,
+}
+
+impl Package {
+    fn new(sender_country: String, recipient_country: String, weight_in_grams: i32) -> Package {
+        if weight_in_grams <= 0 {
+            // Something goes here...
+        } else {
+            return Package {sender_country, recipient_country, weight_in_grams};
+        }
+    }
+
+    fn is_international(&self) -> ??? {
+        // Something goes here...
+    }
+
+    fn get_fees(&self, cents_per_kg: i32) -> ??? {
+        // Something goes here... (beware of grams to kg conversion)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    #[should_panic]
+    fn fail_creating_weightless_package() {
+        let sender_country = String::from("Spain");
+        let recipient_country = String::from("Austria");
+
+        Package::new(sender_country, recipient_country, -2210);
+    }
+
+    #[test]
+    fn create_international_package() {
+        let sender_country = String::from("Spain");
+        let recipient_country = String::from("Russia");
+        
+        let package = Package::new(sender_country, recipient_country, 1200);
+
+        assert!(package.is_international());
+    }
+
+    #[test]
+    fn calculate_transport_fees() {
+        let sender_country = String::from("Spain");
+        let recipient_country = String::from("Spain");
+
+        let cents_per_kg = ???;
+        
+        let package = Package::new(sender_country, recipient_country, 1500);
+        
+        assert_eq!(package.get_fees(cents_per_kg), 4500);
+    }
+}
--- a/exercises/traits/README.md
+++ b/exercises/traits/README.md
@@ -0,0 +1,20 @@
+### Traits
+
+A trait is a collection of methods. 
+
+Data types can implement traits. To do so, the methods making up the trait are defined for the data type. For example, the `String` data type implements the `From<&str>` trait. This allows a user to write `String::from("hello")`.
+
+In this way, traits are somewhat similar to Java interfaces and C++ abstract classes.
+
+Some additional common Rust traits include:
+
+ `Clone` (the `clone` method), 
+ `Display` (which allows formatted display via `{}`), and
+ `Debug` (which allows formatted display via `{:?}`).
+
+Because traits indicate shared behavior between data types, they are useful when writing generics.
+
+
+#### Book Sections
+
+- [Traits](https://doc.rust-lang.org/book/ch10-02-traits.html)
--- a/exercises/variables/variables3.rs
+++ b/exercises/variables/variables3.rs
@@ -6,6 +6,6 @@
 fn main() {
    let x = 3;
    println!("Number {}", x);
-    x = 5;
+    x = 5; // don't change this line
    println!("Number {}", x);
 }
--- a/exercises/variables/variables5.rs
+++ b/exercises/variables/variables5.rs
@@ -4,7 +4,7 @@
 // I AM NOT DONE

 fn main() {
-    let number = "3";
+    let number = "3"; // don't change this line
    println!("Number {}", number);
    number = 3;
    println!("Number {}", number);
--- a/exercises/variables/variables6.rs
+++ b/exercises/variables/variables6.rs
@@ -0,0 +1,9 @@
+// variables6.rs
+// Make me compile! Execute the command `rustlings hint variables6` if you want a hint :)
+
+// I AM NOT DONE
+
+const NUMBER = 3;
+fn main() {
+    println!("Number {}", NUMBER);
+}
--- a/info.toml
+++ b/info.toml
@@ -52,9 +52,25 @@ because we want to assign a different typed value to an existing variable. Somet
 you may also like to reuse existing variable names because you are just converting
 values to different types like in this exercise.
 Fortunately Rust has a powerful solution to this problem: 'Shadowing'!
-You can read more about 'Shadowing' in the book's section 'Variables and Mutability'.
+You can read more about 'Shadowing' in the book's section 'Variables and Mutability': 
+https://doc.rust-lang.org/book/ch03-01-variables-and-mutability.html#shadowing
 Try to solve this exercise afterwards using this technique."""

+[[exercises]]
+name = "variables6"
+path = "exercises/variables/variables6.rs"
+mode = "compile"
+hint = """
+We know about variables and mutability, but there is another important type of 
+variable available; constants. 
+Constants are always immutable and they are declared with keyword 'const' rather 
+than keyword 'let'.
+Constants types must also always be annotated.
+
+Read more about constants under 'Differences Between Variables and Constants' in the book's section 'Variables and Mutability': 
+https://doc.rust-lang.org/book/ch03-01-variables-and-mutability.html#differences-between-variables-and-constants
+"""
+
 # IF

 [[exercises]]
@@ -71,6 +87,15 @@ Remember in Rust that:
 - `if`/`else` conditionals are expressions
 - Each condition is followed by a `{}` block."""

+[[exercises]]
+name = "if2"
+path = "exercises/if/if2.rs"
+mode = "test"
+hint = """
+For that first compiler error, it's important in Rust that each conditional
+block return the same type! To get the tests passing, you will need a couple
+conditions checking different input values."""
+
 # FUNCTIONS

 [[exercises]]
@@ -124,8 +149,8 @@ They are not the same. There are two solutions:
 # TEST 1

 [[exercises]]
-name = "test1"
-path = "exercises/test1.rs"
+name = "quiz1"
+path = "exercises/quiz1.rs"
 mode = "test"
 hint = "No hints this time ;)"

@@ -199,13 +224,35 @@ Now you have another tool in your toolbox!"""
 name = "structs1"
 path = "exercises/structs/structs1.rs"
 mode = "test"
-hint = "No hints this time ;)"
+hint = """
+Rust has more than one type of struct. Both variants are used to package related data together.
+On the one hand, there are normal, or classic, structs. These are named collections of related data stored in fields.
+The other variant is tuple structs. Basically just named tuples.
+In this exercise you need to implement one of each kind.
+
+Read more about structs in The Book: https://doc.rust-lang.org/stable/book/ch05-00-structs.html"""

 [[exercises]]
 name = "structs2"
 path = "exercises/structs/structs2.rs"
 mode = "test"
-hint = "No hints this time ;)"
+hint = """
+Creating instances of structs is easy, all you need to do is assign some values to its fields. 
+There is however some shortcuts that can be taken when instantiating structs. 
+Have a look in The Book, to find out more: https://doc.rust-lang.org/stable/book/ch05-01-defining-structs.html#creating-instances-from-other-instances-with-struct-update-syntax"""
+
+[[exercises]]
+name = "structs3"
+path = "exercises/structs/structs3.rs"
+mode = "test"
+hint = """
+The new method needs to panic if the weight is physically impossible :), how do we do that in Rust?
+
+For is_international: What makes a package international? Seems related to the places it goes through right?
+
+For calculate_transport_fees: Bigger is more expensive usually, we don't have size, but something may fit the bill here :)
+
+Have a look in The Book, to find out more about method implementations: https://doc.rust-lang.org/book/ch05-03-method-syntax.html"""

 # STRINGS

@@ -233,8 +280,8 @@ string slice instead of a `String`, wouldn't it?? There is a way to add one char
 # TEST 2

 [[exercises]]
-name = "test2"
-path = "exercises/test2.rs"
+name = "quiz2"
+path = "exercises/quiz2.rs"
 mode = "compile"
 hint = "No hints this time ;)"

@@ -296,8 +343,8 @@ can negate the result of what you're doing using `!`, like `assert!(!having_fun(
 # TEST 3

 [[exercises]]
-name = "test3"
-path = "exercises/test3.rs"
+name = "quiz3"
+path = "exercises/quiz3.rs"
 mode = "test"
 hint = "No hints this time ;)"

@@ -367,8 +414,8 @@ The way macros are written, it wants to see something between each
 # TEST 4

 [[exercises]]
-name = "test4"
-path = "exercises/test4.rs"
+name = "quiz4"
+path = "exercises/quiz4.rs"
 mode = "test"
 hint = "No hints this time ;)"

@@ -476,7 +523,7 @@ mode = "test"
 hint = """
 First hint: To figure out what type should go where the ??? is, take a look
 at the test helper function `test_with_str`, since it returns whatever
-`read_and_validate` returns and`test_with_str` has its signature fully
+`read_and_validate` returns and `test_with_str` has its signature fully
 specified.


@@ -511,14 +558,34 @@ https://doc.rust-lang.org/std/result/#results-must-be-used"""

 [[exercises]]
 name = "option1"
-path = "exercises/error_handling/option1.rs"
-mode = "test"
+path = "exercises/option/option1.rs"
+mode = "compile"
 hint = """
-Try using a `match` statement where the arms are `Some(thing)` and `None`.
-Or set a default value to print out if you get `None` by using the
-function `unwrap_or`.
-Or use an `if let` statement on the result of `pop()` to both destructure
-a `Some` value and only print out something if we have a value!"""
+Hint 1: Check out some functions of Option:
+is_some
+is_none
+unwrap
+
+and:
+pattern matching
+
+Hint 2: There are no sensible defaults for the value of an Array; the values need to be filled before use.
+"""
+
+[[exercises]]
+name = "option2"
+path = "exercises/option/option2.rs"
+mode = "compile"
+hint = """
+check out:
+https://doc.rust-lang.org/rust-by-example/flow_control/if_let.html
+https://doc.rust-lang.org/rust-by-example/flow_control/while_let.html
+
+Remember that Options can be stacked in if let and while let.
+For example: Some(Some(variable)) = variable2
+
+
+"""

 [[exercises]]
 name = "result1"
@@ -529,8 +596,42 @@ hint = """
 It should be doing some checking, returning an `Err` result if those checks fail, and only
 returning an `Ok` result if those checks determine that everything is... okay :)"""

+#  CLIPPY
+
+[[exercises]]
+name = "clippy1"
+path = "exercises/clippy/clippy1.rs"
+mode = "clippy"
+hint = """
+Floating point calculations are usually imprecise, so asking if two values are exactly equal is asking for trouble"""
+
+[[exercises]]
+name = "clippy2"
+path = "exercises/clippy/clippy2.rs"
+mode = "clippy"
+hint = """
+`for` loops over Option values are more clearly expressed as an `if let`"""
+
 # STANDARD LIBRARY TYPES

+[[exercises]]
+name = "box1"
+path = "exercises/standard_library_types/box1.rs"
+mode = "test"
+hint = """
+Step 1
+The compiler's message should help: since we cannot store the value of the actual type
+when working with recursive types, we need to store a reference (pointer) to its value.
+We should, therefore, place our `List` inside a `Box`. More details in the book here:
+https://doc.rust-lang.org/book/ch15-01-box.html#enabling-recursive-types-with-boxes
+
+Step 2
+Creating an empty list should be fairly straightforward (hint: peek at the assertions).
+For a non-empty list keep in mind that we want to use our Cons "list builder".
+Although the current list is one of integers (i32), feel free to change the definition
+and try other types!
+"""
+
 [[exercises]]
 name = "arc1"
 path = "exercises/standard_library_types/arc1.rs"
@@ -581,10 +682,10 @@ name = "iterators4"
 path = "exercises/standard_library_types/iterators4.rs"
 mode = "test"
 hint = """
-In an imperative language you might write a for loop to iterate through
-multiply the values into a mutable variable. Or you might write code more
-functionally with recursion and a match clause. But you can also use ranges
-and iterators to solve this in rust."""
+In an imperative language, you might write a for loop that updates 
+a mutable variable. Or, you might write code utilizing recursion 
+and a match clause. In Rust you can take another functional
+approach, computing the factorial elegantly with ranges and iterators."""

 # TRAITS

@@ -594,7 +695,7 @@ path = "exercises/traits/traits1.rs"
 mode = "test"
 hint = """
 A discussion about Traits in Rust can be found at:
-https://doc.rust-lang.org/1.30.0/book/second-edition/ch10-02-traits.html
+https://doc.rust-lang.org/book/ch10-02-traits.html
 """

 [[exercises]]
@@ -608,6 +709,40 @@ Try mutating the incoming string vector.
 Vectors provide suitable methods for adding an element at the end. See 
 the documentation at: https://doc.rust-lang.org/std/vec/struct.Vec.html"""

+# Generics
+
+[[exercises]]
+name = "generics1"
+path = "exercises/generics/generics1.rs"
+mode = "compile"
+hint = """
+Vectors in rust make use of generics to create dynamically sized arrays of any type.
+You need to tell the compiler what type we are pushing onto this vector."""
+
+[[exercises]]
+name = "generics2"
+path = "exercises/generics/generics2.rs"
+mode = "test"
+hint = """
+Currently we are wrapping only values of type 'u32'. 
+Maybe we could update the explicit references to this data type somehow?
+
+If you are still stuck https://doc.rust-lang.org/stable/book/ch10-01-syntax.html#in-method-definitions
+"""
+
+[[exercises]]
+name = "generics3"
+path = "exercises/generics/generics3.rs"
+mode = "test"
+hint = """
+To find the best solution to this challenge you're going to need to think back to your 
+knowledge of traits, specifically Trait Bound Syntax -  you may also need this: "use std::fmt::Display;"
+
+This is definitely harder than the last two exercises! You need to think about not only making the
+ReportCard struct generic, but also the correct property - you will need to change the implementation
+of the struct slightly too...you can do it!
+"""
+
 # THREADS

 [[exercises]]
@@ -669,7 +804,7 @@ name = "try_from_into"
 path = "exercises/conversions/try_from_into.rs"
 mode = "test"
 hint = """
-Follow the steps provided right before the `From` implementation.
+Follow the steps provided right before the `TryFrom` implementation.
 You can also use the example at https://doc.rust-lang.org/std/convert/trait.TryFrom.html"""

 [[exercises]]
@@ -684,5 +819,6 @@ name = "from_str"
 path = "exercises/conversions/from_str.rs"
 mode = "test"
 hint = """
-If you've already solved try_from_into.rs, then this is almost a copy-paste.
-Otherwise, go ahead and solve try_from_into.rs first."""
+The implementation of FromStr should return an Ok with a Person object,
+or an Err with a string if the string is not valid.
+This is almost like the `try_from_into` exercise."""
--- a/install.ps1
+++ b/install.ps1
@@ -72,6 +72,7 @@ if (!($LASTEXITCODE -eq 0)) {
 # but anyone running pwsh 5 will have to pass the argument.
 $version = Invoke-WebRequest -UseBasicParsing https://api.github.com/repos/rust-lang/rustlings/releases/latest `
    | ConvertFrom-Json | Select-Object -ExpandProperty tag_name
+
 Write-Host "Checking out version $version..."
 Set-Location $path
 git checkout -q tags/$version
@@ -82,4 +83,12 @@ if (!(Get-Command rustlings -ErrorAction SilentlyContinue)) {
    Write-Host "WARNING: Please check that you have '~/.cargo/bin' in your PATH environment variable!"
 }

+# Checking whether Clippy is installed.
+# Due to a bug in Cargo, this must be done with Rustup: https://github.com/rust-lang/rustup/issues/1514
+$clippy = (rustup component list | Select-String "clippy" | Select-String "installed") | Out-String
+if (!$clippy) {
+    Write-Host "Installing the 'cargo-clippy' executable..."
+    rustup component add clippy
+}
+
 Write-Host "All done! Run 'rustlings' to get started."
--- a/install.sh
+++ b/install.sh
@@ -30,6 +30,22 @@ else
    exit 1
 fi

+# Look up python installations, starting with 3 with a fallback of 2
+if [ -x "$(command -v python3)" ]
+then
+    PY="$(command -v python3)"
+elif [ -x "$(command -v python)" ]
+then
+    PY="$(command -v python)"
+elif [ -x "$(command -v python2)" ]
+then
+    PY="$(command -v python2)"
+else
+    echo "ERROR: No working python installation was found"
+    echo "Please install python and add it to the PATH variable"
+    exit 1
+fi
+
 # Function that compares two versions strings v1 and v2 given in arguments (e.g 1.31 and 1.33.0).
 # Returns 1 if v1 > v2, 0 if v1 == v2, 2 if v1 < v2.
 function vercomp() {
@@ -86,17 +102,46 @@ Path=${1:-rustlings/}
 echo "Cloning Rustlings at $Path..."
 git clone -q https://github.com/rust-lang/rustlings $Path

-Version=$(curl -s https://api.github.com/repos/rust-lang/rustlings/releases/latest | python -c "import json,sys;obj=json.load(sys.stdin);print(obj['tag_name']);")
-echo "Checking out version $Version..."
 cd $Path
-git checkout -q tags/$Version
+
+Version=$(curl -s https://api.github.com/repos/rust-lang/rustlings/releases/latest | ${PY} -c "import json,sys;obj=json.load(sys.stdin);print(obj['tag_name']);")
+CargoBin="${CARGO_HOME:-$HOME/.cargo}/bin"
+
+if [[ -z ${Version} ]]
+then
+    echo "The latest tag version could not be fetched remotely."
+    echo "Using the local git repository..."
+    Version=$(ls -tr .git/refs/tags/ | tail -1)
+    if [[ -z ${Version}  ]]
+    then
+        echo "No valid tag version found"
+        echo "Rustlings will be installed using the main branch"
+        Version="main"
+    else
+        Version="tags/${Version}"
+    fi
+else
+    Version="tags/${Version}"
+fi
+
+echo "Checking out version $Version..."
+git checkout -q ${Version}

 echo "Installing the 'rustlings' executable..."
 cargo install --force --path .

 if ! [ -x "$(command -v rustlings)" ]
 then
-    echo "WARNING: Please check that you have '~/.cargo/bin' in your PATH environment variable!"
+    echo "WARNING: Please check that you have '$CargoBin' in your PATH environment variable!"
+fi
+
+# Checking whether Clippy is installed.
+# Due to a bug in Cargo, this must be done with Rustup: https://github.com/rust-lang/rustup/issues/1514
+Clippy=$(rustup component list | grep "clippy" | grep "installed")
+if [ -z "$Clippy" ]
+then
+    echo "Installing the 'cargo-clippy' executable..."
+    rustup component add clippy
 fi

 echo "All done! Run 'rustlings' to get started."
--- a/src/exercise.rs
+++ b/src/exercise.rs
@@ -1,24 +1,32 @@
 use regex::Regex;
 use serde::Deserialize;
 use std::fmt::{self, Display, Formatter};
-use std::fs::{remove_file, File};
+use std::fs::{self, remove_file, File};
 use std::io::Read;
 use std::path::PathBuf;
-use std::process::{self, Command, Output};
+use std::process::{self, Command};

 const RUSTC_COLOR_ARGS: &[&str] = &["--color", "always"];
 const I_AM_DONE_REGEX: &str = r"(?m)^\s*///?\s*I\s+AM\s+NOT\s+DONE";
 const CONTEXT: usize = 2;
+const CLIPPY_CARGO_TOML_PATH: &str = "./exercises/clippy/Cargo.toml";

+// Get a temporary file name that is hopefully unique to this process
+#[inline]
 fn temp_file() -> String {
    format!("./temp_{}", process::id())
 }

+// The mode of the exercise.
 #[derive(Deserialize, Copy, Clone)]
 #[serde(rename_all = "lowercase")]
 pub enum Mode {
+    // Indicates that the exercise should be compiled as a binary
    Compile,
+    // Indicates that the exercise should be compiled as a test harness
    Test,
+    // Indicates that the exercise should be linted with clippy
+    Clippy,
 }

 #[derive(Deserialize)]
@@ -26,30 +34,74 @@ pub struct ExerciseList {
    pub exercises: Vec<Exercise>,
 }

+// A representation of a rustlings exercise.
+// This is deserialized from the accompanying info.toml file
 #[derive(Deserialize)]
 pub struct Exercise {
+    // Name of the exercise
    pub name: String,
+    // The path to the file containing the exercise's source code
    pub path: PathBuf,
+    // The mode of the exercise (Test, Compile, or Clippy)
    pub mode: Mode,
+    // The hint text associated with the exercise
    pub hint: String,
 }

+// An enum to track of the state of an Exercise.
+// An Exercise can be either Done or Pending
 #[derive(PartialEq, Debug)]
 pub enum State {
+    // The state of the exercise once it's been completed
    Done,
+    // The state of the exercise while it's not completed yet
    Pending(Vec<ContextLine>),
 }

+// The context information of a pending exercise
 #[derive(PartialEq, Debug)]
 pub struct ContextLine {
+    // The source code that is still pending completion
    pub line: String,
+    // The line number of the source code still pending completion
    pub number: usize,
+    // Whether or not this is important
    pub important: bool,
 }

+// The result of compiling an exercise
+pub struct CompiledExercise<'a> {
+    exercise: &'a Exercise,
+    _handle: FileHandle,
+}
+
+impl<'a> CompiledExercise<'a> {
+    // Run the compiled exercise
+    pub fn run(&self) -> Result<ExerciseOutput, ExerciseOutput> {
+        self.exercise.run()
+    }
+}
+
+// A representation of an already executed binary
+#[derive(Debug)]
+pub struct ExerciseOutput {
+    // The textual contents of the standard output of the binary
+    pub stdout: String,
+    // The textual contents of the standard error of the binary
+    pub stderr: String,
+}
+
+struct FileHandle;
+
+impl Drop for FileHandle {
+    fn drop(&mut self) {
+        clean();
+    }
+}
+
 impl Exercise {
-    pub fn compile(&self) -> Output {
-        match self.mode {
+    pub fn compile(&self) -> Result<CompiledExercise, ExerciseOutput> {
+        let cmd = match self.mode {
            Mode::Compile => Command::new("rustc")
                .args(&[self.path.to_str().unwrap(), "-o", &temp_file()])
                .args(RUSTC_COLOR_ARGS)
@@ -58,18 +110,79 @@ impl Exercise {
                .args(&["--test", self.path.to_str().unwrap(), "-o", &temp_file()])
                .args(RUSTC_COLOR_ARGS)
                .output(),
+            Mode::Clippy => {
+                let cargo_toml = format!(
+                    r#"[package]
+name = "{}"
+version = "0.0.1"
+edition = "2018"
+[[bin]]
+name = "{}"
+path = "{}.rs""#,
+                    self.name, self.name, self.name
+                );
+                fs::write(CLIPPY_CARGO_TOML_PATH, cargo_toml)
+                    .expect("Failed to write 📎 Clippy 📎 Cargo.toml file.");
+                // To support the ability to run the clipy exercises, build
+                // an executable, in addition to running clippy. With a
+                // compilation failure, this would silently fail. But we expect
+                // clippy to reflect the same failure while compiling later.
+                Command::new("rustc")
+                    .args(&[self.path.to_str().unwrap(), "-o", &temp_file()])
+                    .args(RUSTC_COLOR_ARGS)
+                    .output()
+                    .expect("Failed to compile!");
+                // Due to an issue with Clippy, a cargo clean is required to catch all lints.
+                // See https://github.com/rust-lang/rust-clippy/issues/2604
+                // This is already fixed on Clippy's master branch. See this issue to track merging into Cargo:
+                // https://github.com/rust-lang/rust-clippy/issues/3837
+                Command::new("cargo")
+                    .args(&["clean", "--manifest-path", CLIPPY_CARGO_TOML_PATH])
+                    .args(RUSTC_COLOR_ARGS)
+                    .output()
+                    .expect("Failed to run 'cargo clean'");
+                Command::new("cargo")
+                    .args(&["clippy", "--manifest-path", CLIPPY_CARGO_TOML_PATH])
+                    .args(RUSTC_COLOR_ARGS)
+                    .args(&["--", "-D", "warnings"])
+                    .output()
+            }
+        }
+        .expect("Failed to run 'compile' command.");
+
+        if cmd.status.success() {
+            Ok(CompiledExercise {
+                exercise: &self,
+                _handle: FileHandle,
+            })
+        } else {
+            clean();
+            Err(ExerciseOutput {
+                stdout: String::from_utf8_lossy(&cmd.stdout).to_string(),
+                stderr: String::from_utf8_lossy(&cmd.stderr).to_string(),
+            })
        }
-        .expect("Failed to run 'compile' command.")
    }

-    pub fn run(&self) -> Output {
-        Command::new(&temp_file())
+    fn run(&self) -> Result<ExerciseOutput, ExerciseOutput> {
+        let arg = match self.mode {
+            Mode::Test => "--show-output",
+            _ => ""
+        };
+        let cmd = Command::new(&temp_file()).arg(arg)
            .output()
-            .expect("Failed to run 'run' command")
-    }
+            .expect("Failed to run 'run' command");

-    pub fn clean(&self) {
-        let _ignored = remove_file(&temp_file());
+        let output = ExerciseOutput {
+            stdout: String::from_utf8_lossy(&cmd.stdout).to_string(),
+            stderr: String::from_utf8_lossy(&cmd.stderr).to_string(),
+        };
+
+        if cmd.status.success() {
+            Ok(output)
+        } else {
+            Err(output)
+        }
    }

    pub fn state(&self) -> State {
@@ -121,6 +234,11 @@ impl Display for Exercise {
    }
 }

+#[inline]
+fn clean() {
+    let _ignored = remove_file(&temp_file());
+}
+
 #[cfg(test)]
 mod test {
    use super::*;
@@ -131,11 +249,12 @@ mod test {
        File::create(&temp_file()).unwrap();
        let exercise = Exercise {
            name: String::from("example"),
-            path: PathBuf::from("example.rs"),
-            mode: Mode::Test,
+            path: PathBuf::from("tests/fixture/state/pending_exercise.rs"),
+            mode: Mode::Compile,
            hint: String::from(""),
        };
-        exercise.clean();
+        let compiled = exercise.compile().unwrap();
+        drop(compiled);
        assert!(!Path::new(&temp_file()).exists());
    }

@@ -191,4 +310,16 @@ mod test {

        assert_eq!(exercise.state(), State::Done);
    }
+
+    #[test]
+    fn test_exercise_with_output() {
+        let exercise = Exercise {
+            name: "finished_exercise".into(),
+            path: PathBuf::from("tests/fixture/success/testSuccess.rs"),
+            mode: Mode::Test,
+            hint: String::new(),
+        };
+        let out = exercise.compile().unwrap().run().unwrap();
+        assert!(out.stdout.contains("THIS TEST TOO SHALL PASS"));
+    }
 }
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,6 +15,9 @@ use std::sync::{Arc, Mutex};
 use std::thread;
 use std::time::Duration;

+#[macro_use]
+mod ui;
+
 mod exercise;
 mod run;
 mod verify;
@@ -24,8 +27,21 @@ fn main() {
        .version(crate_version!())
        .author("Olivia Hugger, Carol Nichols")
        .about("Rustlings is a collection of small exercises to get you used to writing and reading Rust code")
-        .subcommand(SubCommand::with_name("verify").alias("v").about("Verifies all exercises according to the recommended order"))
-        .subcommand(SubCommand::with_name("watch").alias("w").about("Reruns `verify` when files were edited"))
+        .arg(
+            Arg::with_name("nocapture")
+                .long("nocapture")
+                .help("Show outputs from the test exercises")
+        )
+        .subcommand(
+            SubCommand::with_name("verify")
+                .alias("v")
+                .about("Verifies all exercises according to the recommended order")
+        )
+        .subcommand(
+            SubCommand::with_name("watch")
+                .alias("w")
+                .about("Reruns `verify` when files were edited")
+        )
        .subcommand(
            SubCommand::with_name("run")
                .alias("r")
@@ -40,7 +56,7 @@ fn main() {
        )
        .get_matches();

-    if None == matches.subcommand_name() {
+    if matches.subcommand_name().is_none() {
        println!();
        println!(r#"       welcome to...                      "#);
        println!(r#"                 _   _ _                  "#);
@@ -70,6 +86,7 @@ fn main() {

    let toml_str = &fs::read_to_string("info.toml").unwrap();
    let exercises = toml::from_str::<ExerciseList>(toml_str).unwrap().exercises;
+    let verbose = matches.is_present("nocapture");

    if let Some(ref matches) = matches.subcommand_matches("run") {
        let name = matches.value_of("name").unwrap();
@@ -81,7 +98,7 @@ fn main() {
            std::process::exit(1)
        });

-        run(&exercise).unwrap_or_else(|_| std::process::exit(1));
+        run(&exercise, verbose).unwrap_or_else(|_| std::process::exit(1));
    }

    if let Some(ref matches) = matches.subcommand_matches("hint") {
@@ -99,25 +116,23 @@ fn main() {
    }

    if matches.subcommand_matches("verify").is_some() {
-        verify(&exercises).unwrap_or_else(|_| std::process::exit(1));
+        verify(&exercises, verbose).unwrap_or_else(|_| std::process::exit(1));
    }

-    if matches.subcommand_matches("watch").is_some() {
-        if watch(&exercises).is_ok() {
-            println!(
-                "{emoji} All exercises completed! {emoji}",
-                emoji = Emoji("🎉", "★")
-            );
-            println!("");
-            println!("We hope you enjoyed learning about the various aspects of Rust!");
-            println!(
-                "If you noticed any issues, please don't hesitate to report them to our repo."
-            );
-            println!("You can also contribute your own exercises to help the greater community!");
-            println!("");
-            println!("Before reporting an issue or contributing, please read our guidelines:");
-            println!("https://github.com/rust-lang/rustlings/blob/master/CONTRIBUTING.md");
-        }
+    if matches.subcommand_matches("watch").is_some() && watch(&exercises, verbose).is_ok() {
+        println!(
+            "{emoji} All exercises completed! {emoji}",
+            emoji = Emoji("🎉", "★")
+        );
+        println!();
+        println!("We hope you enjoyed learning about the various aspects of Rust!");
+        println!(
+            "If you noticed any issues, please don't hesitate to report them to our repo."
+        );
+        println!("You can also contribute your own exercises to help the greater community!");
+        println!();
+        println!("Before reporting an issue or contributing, please read our guidelines:");
+        println!("https://github.com/rust-lang/rustlings/blob/main/CONTRIBUTING.md");
    }

    if matches.subcommand_name().is_none() {
@@ -146,7 +161,7 @@ fn spawn_watch_shell(failed_exercise_hint: &Arc<Mutex<Option<String>>>) {
    });
 }

-fn watch(exercises: &[Exercise]) -> notify::Result<()> {
+fn watch(exercises: &[Exercise], verbose: bool) -> notify::Result<()> {
    /* Clears the terminal with an ANSI escape code.
    Works in UNIX and newer Windows terminals. */
    fn clear_screen() {
@@ -161,7 +176,7 @@ fn watch(exercises: &[Exercise]) -> notify::Result<()> {
    clear_screen();

    let to_owned_hint = |t: &Exercise| t.hint.to_owned();
-    let failed_exercise_hint = match verify(exercises.iter()) {
+    let failed_exercise_hint = match verify(exercises.iter(), verbose) {
        Ok(_) => return Ok(()),
        Err(exercise) => Arc::new(Mutex::new(Some(to_owned_hint(exercise)))),
    };
@@ -176,7 +191,7 @@ fn watch(exercises: &[Exercise]) -> notify::Result<()> {
                            .iter()
                            .skip_while(|e| !filepath.ends_with(&e.path));
                        clear_screen();
-                        match verify(pending_exercises) {
+                        match verify(pending_exercises, verbose) {
                            Ok(_) => return Ok(()),
                            Err(exercise) => {
                                let mut failed_exercise_hint = failed_exercise_hint.lock().unwrap();
--- a/src/run.rs
+++ b/src/run.rs
@@ -1,52 +1,58 @@
 use crate::exercise::{Exercise, Mode};
 use crate::verify::test;
-use console::{style, Emoji};
 use indicatif::ProgressBar;

-pub fn run(exercise: &Exercise) -> Result<(), ()> {
+// Invoke the rust compiler on the path of the given exercise,
+// and run the ensuing binary.
+// The verbose argument helps determine whether or not to show
+// the output from the test harnesses (if the mode of the exercise is test)
+pub fn run(exercise: &Exercise, verbose: bool) -> Result<(), ()> {
    match exercise.mode {
-        Mode::Test => test(exercise)?,
+        Mode::Test => test(exercise, verbose)?,
        Mode::Compile => compile_and_run(exercise)?,
+        Mode::Clippy => compile_and_run(exercise)?,
    }
    Ok(())
 }

-pub fn compile_and_run(exercise: &Exercise) -> Result<(), ()> {
+// Invoke the rust compiler on the path of the given exercise
+// and run the ensuing binary.
+// This is strictly for non-test binaries, so output is displayed
+fn compile_and_run(exercise: &Exercise) -> Result<(), ()> {
    let progress_bar = ProgressBar::new_spinner();
    progress_bar.set_message(format!("Compiling {}...", exercise).as_str());
    progress_bar.enable_steady_tick(100);

-    let compilecmd = exercise.compile();
+    let compilation_result = exercise.compile();
+    let compilation = match compilation_result {
+        Ok(compilation) => compilation,
+        Err(output) => {
+            progress_bar.finish_and_clear();
+            warn!(
+                "Compilation of {} failed!, Compiler error message:\n",
+                exercise
+            );
+            println!("{}", output.stderr);
+            return Err(());
+        }
+    };
+
    progress_bar.set_message(format!("Running {}...", exercise).as_str());
-    if compilecmd.status.success() {
-        let runcmd = exercise.run();
-        progress_bar.finish_and_clear();
+    let result = compilation.run();
+    progress_bar.finish_and_clear();

-        if runcmd.status.success() {
-            println!("{}", String::from_utf8_lossy(&runcmd.stdout));
-            let formatstr = format!("{} Successfully ran {}", Emoji("✅", "✓"), exercise);
-            println!("{}", style(formatstr).green());
-            exercise.clean();
+    match result {
+        Ok(output) => {
+            println!("{}", output.stdout);
+            success!("Successfully ran {}", exercise);
            Ok(())
-        } else {
-            println!("{}", String::from_utf8_lossy(&runcmd.stdout));
-            println!("{}", String::from_utf8_lossy(&runcmd.stderr));
+        }
+        Err(output) => {
+            println!("{}", output.stdout);
+            println!("{}", output.stderr);

-            let formatstr = format!("{} Ran {} with errors", Emoji("⚠️ ", "!"), exercise);
-            println!("{}", style(formatstr).red());
-            exercise.clean();
+            warn!("Ran {} with errors", exercise);
            Err(())
        }
-    } else {
-        progress_bar.finish_and_clear();
-        let formatstr = format!(
-            "{} Compilation of {} failed! Compiler error message:\n",
-            Emoji("⚠️ ", "!"),
-            exercise
-        );
-        println!("{}", style(formatstr).red());
-        println!("{}", String::from_utf8_lossy(&compilecmd.stderr));
-        exercise.clean();
-        Err(())
    }
 }
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -0,0 +1,23 @@
+macro_rules! warn {
+    ($fmt:literal, $ex:expr) => {{
+        use console::{style, Emoji};
+        let formatstr = format!($fmt, $ex);
+        println!(
+            "{} {}",
+            style(Emoji("⚠️ ", "!")).red(),
+            style(formatstr).red()
+        );
+    }};
+}
+
+macro_rules! success {
+    ($fmt:literal, $ex:expr) => {{
+        use console::{style, Emoji};
+        let formatstr = format!($fmt, $ex);
+        println!(
+            "{} {}",
+            style(Emoji("✅", "✓")).green(),
+            style(formatstr).green()
+        );
+    }};
+}
--- a/src/verify.rs
+++ b/src/verify.rs
@@ -1,12 +1,21 @@
-use crate::exercise::{Exercise, Mode, State};
-use console::{style, Emoji};
+use crate::exercise::{CompiledExercise, Exercise, Mode, State};
+use console::style;
 use indicatif::ProgressBar;

-pub fn verify<'a>(start_at: impl IntoIterator<Item = &'a Exercise>) -> Result<(), &'a Exercise> {
+// Verify that the provided container of Exercise objects
+// can be compiled and run without any failures.
+// Any such failures will be reported to the end user.
+// If the Exercise being verified is a test, the verbose boolean
+// determines whether or not the test harness outputs are displayed.
+pub fn verify<'a>(
+    start_at: impl IntoIterator<Item = &'a Exercise>,
+    verbose: bool
+) -> Result<(), &'a Exercise> {
    for exercise in start_at {
        let compile_result = match exercise.mode {
-            Mode::Test => compile_and_test_interactively(&exercise),
-            Mode::Compile => compile_only(&exercise),
+            Mode::Test => compile_and_test(&exercise, RunMode::Interactive, verbose),
+            Mode::Compile => compile_and_run_interactively(&exercise),
+            Mode::Clippy => compile_only(&exercise),
        };
        if !compile_result.unwrap_or(false) {
            return Err(exercise);
@@ -15,82 +24,115 @@ pub fn verify<'a>(start_at: impl IntoIterator<Item = &'a Exercise>) -> Result<()
    Ok(())
 }

-pub fn test(exercise: &Exercise) -> Result<(), ()> {
-    compile_and_test(exercise, true)?;
+enum RunMode {
+    Interactive,
+    NonInteractive,
+}
+
+// Compile and run the resulting test harness of the given Exercise
+pub fn test(exercise: &Exercise, verbose: bool) -> Result<(), ()> {
+    compile_and_test(exercise, RunMode::NonInteractive, verbose)?;
    Ok(())
 }

+// Invoke the rust compiler without running the resulting binary
 fn compile_only(exercise: &Exercise) -> Result<bool, ()> {
    let progress_bar = ProgressBar::new_spinner();
    progress_bar.set_message(format!("Compiling {}...", exercise).as_str());
    progress_bar.enable_steady_tick(100);
-    let compile_output = exercise.compile();
+
+    let _ = compile(&exercise, &progress_bar)?;
    progress_bar.finish_and_clear();
-    if compile_output.status.success() {
-        let formatstr = format!("{} Successfully compiled {}!", Emoji("✅", "✓"), exercise);
-        println!("{}", style(formatstr).green());
-        exercise.clean();
-        Ok(prompt_for_completion(&exercise))
-    } else {
-        let formatstr = format!(
-            "{} Compilation of {} failed! Compiler error message:\n",
-            Emoji("⚠️ ", "!"),
-            exercise
-        );
-        println!("{}", style(formatstr).red());
-        println!("{}", String::from_utf8_lossy(&compile_output.stderr));
-        exercise.clean();
-        Err(())
-    }
+
+    success!("Successfully compiled {}!", exercise);
+    Ok(prompt_for_completion(&exercise, None))
 }

-fn compile_and_test_interactively(exercise: &Exercise) -> Result<bool, ()> {
-    compile_and_test(exercise, false)
+// Compile the given Exercise and run the resulting binary in an interactive mode
+fn compile_and_run_interactively(exercise: &Exercise) -> Result<bool, ()> {
+    let progress_bar = ProgressBar::new_spinner();
+    progress_bar.set_message(format!("Compiling {}...", exercise).as_str());
+    progress_bar.enable_steady_tick(100);
+
+    let compilation = compile(&exercise, &progress_bar)?;
+
+    progress_bar.set_message(format!("Running {}...", exercise).as_str());
+    let result = compilation.run();
+    progress_bar.finish_and_clear();
+
+    let output = match result {
+        Ok(output) => output,
+        Err(output) => {
+            warn!("Ran {} with errors", exercise);
+            println!("{}", output.stdout);
+            return Err(());
+        }
+    };
+
+    success!("Successfully ran {}!", exercise);
+
+    Ok(prompt_for_completion(&exercise, Some(output.stdout)))
 }

-fn compile_and_test(exercise: &Exercise, skip_prompt: bool) -> Result<bool, ()> {
+// Compile the given Exercise as a test harness and display
+// the output if verbose is set to true
+fn compile_and_test(
+    exercise: &Exercise, run_mode: RunMode, verbose: bool
+) -> Result<bool, ()> {
    let progress_bar = ProgressBar::new_spinner();
    progress_bar.set_message(format!("Testing {}...", exercise).as_str());
    progress_bar.enable_steady_tick(100);

-    let compile_output = exercise.compile();
-    if compile_output.status.success() {
-        progress_bar.set_message(format!("Running {}...", exercise).as_str());
+    let compilation = compile(exercise, &progress_bar)?;
+    let result = compilation.run();
+    progress_bar.finish_and_clear();

-        let runcmd = exercise.run();
-        progress_bar.finish_and_clear();
-
-        if runcmd.status.success() {
-            let formatstr = format!("{} Successfully tested {}!", Emoji("✅", "✓"), exercise);
-            println!("{}", style(formatstr).green());
-            exercise.clean();
-            Ok(skip_prompt || prompt_for_completion(exercise))
-        } else {
-            let formatstr = format!(
-                "{} Testing of {} failed! Please try again. Here's the output:",
-                Emoji("⚠️ ", "!"),
+    match result {
+        Ok(output) => {
+            if verbose {
+                println!("{}", output.stdout);
+            }
+            success!("Successfully tested {}", &exercise);
+            if let RunMode::Interactive = run_mode {
+                Ok(prompt_for_completion(&exercise, None))
+            } else {
+                Ok(true)
+            }
+        }
+        Err(output) => {
+            warn!(
+                "Testing of {} failed! Please try again. Here's the output:",
                exercise
            );
-            println!("{}", style(formatstr).red());
-            println!("{}", String::from_utf8_lossy(&runcmd.stdout));
-            exercise.clean();
+            println!("{}", output.stdout);
            Err(())
        }
-    } else {
-        progress_bar.finish_and_clear();
-        let formatstr = format!(
-            "{} Compiling of {} failed! Please try again. Here's the output:",
-            Emoji("⚠️ ", "!"),
-            exercise
-        );
-        println!("{}", style(formatstr).red());
-        println!("{}", String::from_utf8_lossy(&compile_output.stderr));
-        exercise.clean();
-        Err(())
    }
 }

-fn prompt_for_completion(exercise: &Exercise) -> bool {
+// Compile the given Exercise and return an object with information
+// about the state of the compilation
+fn compile<'a, 'b>(
+    exercise: &'a Exercise,
+    progress_bar: &'b ProgressBar,
+) -> Result<CompiledExercise<'a>, ()> {
+    let compilation_result = exercise.compile();
+
+    match compilation_result {
+        Ok(compilation) => Ok(compilation),
+        Err(output) => {
+            progress_bar.finish_and_clear();
+            warn!(
+                "Compiling of {} failed! Please try again. Here's the output:",
+                exercise
+            );
+            println!("{}", output.stderr);
+            Err(())
+        }
+    }
+}
+
+fn prompt_for_completion(exercise: &Exercise, prompt_output: Option<String>) -> bool {
    let context = match exercise.state() {
        State::Done => return true,
        State::Pending(context) => context,
@@ -99,22 +141,32 @@ fn prompt_for_completion(exercise: &Exercise) -> bool {
    let success_msg = match exercise.mode {
        Mode::Compile => "The code is compiling!",
        Mode::Test => "The code is compiling, and the tests pass!",
+        Mode::Clippy => "The code is compiling, and 📎 Clippy 📎 is happy!",
    };

-    println!("");
+    println!();
    println!("🎉 🎉  {} 🎉 🎉", success_msg);
-    println!("");
+    println!();
+
+    if let Some(output) = prompt_output {
+        println!("Output:");
+        println!("{}", separator());
+        println!("{}", output);
+        println!("{}", separator());
+        println!();
+    }
+
    println!("You can keep working on this exercise,");
    println!(
        "or jump into the next one by removing the {} comment:",
        style("`I AM NOT DONE`").bold()
    );
-    println!("");
+    println!();
    for context_line in context {
        let formatted_line = if context_line.important {
            format!("{}", style(context_line.line).bold())
        } else {
-            format!("{}", context_line.line)
+            context_line.line.to_string()
        };

        println!(
@@ -127,3 +179,7 @@ fn prompt_for_completion(exercise: &Exercise) -> bool {

    false
 }
+
+fn separator() -> console::StyledObject<&'static str> {
+    style("====================").bold()
+}
--- a/tests/fixture/success/testSuccess.rs
+++ b/tests/fixture/success/testSuccess.rs
@@ -1,4 +1,5 @@
 #[test]
 fn passing() {
+    println!("THIS TEST TOO SHALL PASS");
    assert!(true);
 }
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@@ -31,7 +31,7 @@ fn verify_all_success() {
 }

 #[test]
-fn verify_all_failure() {
+fn verify_fails_if_some_fails() {
    Command::cargo_bin("rustlings")
        .unwrap()
        .arg("v")
@@ -159,3 +159,25 @@ fn run_test_exercise_does_not_prompt() {
        .code(0)
        .stdout(predicates::str::contains("I AM NOT DONE").not());
 }
+
+#[test]
+fn run_single_test_success_with_output() {
+    Command::cargo_bin("rustlings")
+        .unwrap()
+        .args(&["--nocapture", "r", "testSuccess"])
+        .current_dir("tests/fixture/success/")
+        .assert()
+        .code(0)
+        .stdout(predicates::str::contains("THIS TEST TOO SHALL PAS"));
+}
+
+#[test]
+fn run_single_test_success_without_output() {
+    Command::cargo_bin("rustlings")
+        .unwrap()
+        .args(&["r", "testSuccess"])
+        .current_dir("tests/fixture/success/")
+        .assert()
+        .code(0)
+        .stdout(predicates::str::contains("THIS TEST TOO SHALL PAS").not());
+}