1.5.0

Auto merge of #224 - nyxtom:feat-enums, r=fmoko
feat: Add enums exercises Creates an exhaustive list of enum exercises. This goes through the basics of different ways to derive enums with mixed data type variants, as well as the use of the all important `match` operator.
2025-12-26 00:11:49 +02:00 · 2019-11-09 10:52:20 +01:00 · 2019-11-09 09:41:36 +00:00 · 2019-11-09 09:31:50 +00:00 · 2019-11-09 00:57:36 -08:00 · 2019-10-29 20:53:41 +01:00
46 changed files with 856 additions and 340 deletions
--- a/.clog.toml
+++ b/.clog.toml
@@ -0,0 +1,4 @@
+[clog]
+
+repository = "https://github.com/rust-lang/rustlings"
+changelog = "CHANGELOG.md"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,127 @@
+<a name="1.5.0"></a>
+## 1.5.0 (2019-11-09)
+
+#### Bug Fixes
+
+* **test1:** Rewrite logic ([79a56942](https://github.com/rust-lang/rustlings/commit/79a569422c8309cfc9e4aed25bf4ab3b3859996b))
+* **installation:**  Fix rustlings installation check ([7a252c47](https://github.com/rust-lang/rustlings/commit/7a252c475551486efb52f949b8af55803b700bc6))
+* **iterators:**  Rename iterator3.rs ([433d2115](https://github.com/rust-lang/rustlings/commit/433d2115bc1c04b6d34a335a18c9a8f3e2672bc6))
+* **iterators2:**  Remove syntax resulting in misleading error message ([4cde8664](https://github.com/rust-lang/rustlings/commit/4cde86643e12db162a66e62f23b78962986046ac))
+* **option1:**
+  *  Fix arguments passed to assert! macro (#222) ([4c2cf6da](https://github.com/rust-lang/rustlings/commit/4c2cf6da755efe02725e05ecc3a303304c10a6da))
+  *  Fix arguments passed to assert! macro ([ead4f7af](https://github.com/rust-lang/rustlings/commit/ead4f7af9e10e53418efdde5c359159347282afd))
+  *  Add test for prematurely passing exercise ([a750e4a1](https://github.com/rust-lang/rustlings/commit/a750e4a1a3006227292bb17d57d78ce84da6bfc6))
+* **primitive_types4:**  Fail on a slice covering the wrong area ([5b1e673c](https://github.com/rust-lang/rustlings/commit/5b1e673cec1658afc4ebbbc800213847804facf5))
+* **readme:**  http to https ([70946b85](https://github.com/rust-lang/rustlings/commit/70946b85e536e80e70ed9505cb650ca0a3a1fbb5))
+* **test1:**
+  *  Swap assertion parameter order ([4086d463](https://github.com/rust-lang/rustlings/commit/4086d463a981e81d97781851d17db2ced290f446))
+  *  renamed function name to snake case closes #180 ([89d5186c](https://github.com/rust-lang/rustlings/commit/89d5186c0dae8135ecabf90ee8bb35949bc2d29b))
+
+#### Features
+
+*   Add enums exercises ([dc150321](https://github.com/rust-lang/rustlings/commit/dc15032112fc485226a573a18139e5ce928b1755))
+*   Added exercise for struct update syntax ([1c4c8764](https://github.com/rust-lang/rustlings/commit/1c4c8764ed118740cd4cee73272ddc6cceb9d959))
+* **iterators2:**  adds iterators2 exercise including config ([9288fccf](https://github.com/rust-lang/rustlings/commit/9288fccf07a2c5043b76d0fd6491e4cf72d76031))
+
+<a name="1.4.1"></a>
+### 1.4.1 (2019-08-13)
+
+
+#### Bug Fixes
+
+* **iterators2:**  Remove syntax resulting in misleading error message ([4cde8664](https://github.com/rust-lang/rustlings/commit/4cde86643e12db162a66e62f23b78962986046ac))
+* **option1:**  Add test for prematurely passing exercise ([a750e4a1](https://github.com/rust-lang/rustlings/commit/a750e4a1a3006227292bb17d57d78ce84da6bfc6))
+* **test1:**  Swap assertion parameter order ([4086d463](https://github.com/rust-lang/rustlings/commit/4086d463a981e81d97781851d17db2ced290f446))
+
+
+
+<a name="1.4.0"></a>
+## 1.4.0 (2019-07-13)
+
+#### Bug Fixes
+
+* **installation:**  Fix rustlings installation check ([7a252c47](https://github.com/rust-lang/rustlings/commit/7a252c475551486efb52f949b8af55803b700bc6))
+* **iterators:**  Rename iterator3.rs ([433d2115](https://github.com/rust-lang/rustlings/commit/433d2115bc1c04b6d34a335a18c9a8f3e2672bc6))
+* **readme:**  http to https ([70946b85](https://github.com/rust-lang/rustlings/commit/70946b85e536e80e70ed9505cb650ca0a3a1fbb5))
+* **test1:**  renamed function name to snake case ([89d5186c](https://github.com/rust-lang/rustlings/commit/89d5186c0dae8135ecabf90ee8bb35949bc2d29b))
+* **cli:** Check if changed exercise file exists before calling verify ([ba85ca3](https://github.com/rust-lang/rustlings/commit/ba85ca32c4cfc61de46851ab89f9c58a28f33c88))
+* **structs1:** Fix the irrefutable let pattern warning ([cc6a141](https://github.com/rust-lang/rustlings/commit/cc6a14104d7c034eadc98297eaaa972d09c50b1f))
+
+#### Features
+
+* **changelog:**  Use clog for changelogs ([34e31232](https://github.com/rust-lang/rustlings/commit/34e31232dfddde284a341c9609b33cd27d9d5724))
+* **iterators2:**  adds iterators2 exercise including config ([9288fccf](https://github.com/rust-lang/rustlings/commit/9288fccf07a2c5043b76d0fd6491e4cf72d76031))
+
+<a name="1.3.0"></a>
+### 1.3.0 (2019-06-05)
+
+#### Features
+
+- Adds a simple exercise for structures (#163, @briankung)
+
+#### Bug Fixes
+
+- Add Result type signature as it is difficult for new comers to understand Generics and Error all at once. (#157, @veggiemonk)
+- Rustfmt and whitespace fixes (#161, @eddyp)
+- errorsn.rs: Separate also the hints from each other to avoid accidental viewing (#162, @eddyp)
+- fixed outdated links (#165, @gushroom)
+- Fix broken link (#164, @HanKruiger)
+- Remove highlighting and syntect (#167, @komaeda)
+
+<a name="1.2.2"></a>
+### 1.2.2 (2019-05-07)
+
+#### Bug Fixes
+
+- Reverted `--nocapture` flag since it was causing tests to pass unconditionally
+
+<a name="1.2.1"></a>
+### 1.2.1 (2019-04-22)
+
+#### Bug Fixes
+
+- Fix the `--nocapture` feature (@komaeda)
+- Provide a nicer error message for when you're in the wrong directory
+
+<a name="1.2.0"></a>
+### 1.2.0 (2019-04-22)
+
+#### Features
+
+- Add errors to exercises that compile without user changes (@yvan-sraka)
+- Use --nocapture when testing, enabling `println!` when running (@komaeda)
+
+<a name="1.1.1"></a>
+### 1.1.1 (2019-04-14)
+
+#### Bug fixes
+
+- Fix permissions on exercise files (@zacanger, #133)
+- Make installation checks more thorough (@komaeda, 1b3469f236bc6979c27f6e1a04e4138a88e55de3)
+- Fix order of true/false in tests for executables (@mgeier, #137)
+- Stop run from panicking when compile fails (@cjpearce, #141)
+- Fix intermittent test failure caused by race condition (@cjpearce, #140)
+- Fix links by deleting book version (@diodfr, #142)
+- Canonicalize paths to fix path matching (@cjpearce, #143)
+
+<a name="1.1.0"></a>
+### 1.1.0 (2019-03-20)
+
+- errors2.rs: update link to Rust book (#124)
+- Start verification at most recently modified file (#120)
+- Watch for file creation events in watch mode (#117)
+- Add standard library types to exercises suite (#119)
+- Give a warning when Rustlings isn't run from the right directory (#123)
+- Verify that rust version is recent enough to install Rustlings (#131)
+
+<a name="1.0.1"></a>
+### 1.0.1 (2019-03-06)
+
+- Adds a way to install Rustlings in one command (`curl -L https://git.io/rustlings | bash`)
+- Makes `rustlings watch` react to create file events (@shaunbennett, #117)
+- Reworks the exercise management to use an external TOML file instead of just listing them in the code
+
+<a name="1.0.0"></a>
+### 1.0.0 (2019-03-06)
+
+Initial release.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,128 @@
+## Contributing to Rustlings
+
+First off, thanks for taking the time to contribute!! ❤️
+
+### Quick Reference
+
+I want to...
+
+_add an exercise! ➡️ [read this](#addex) and then [open a Pull Request](#prs)_
+
+_update an outdated exercise! ➡️ [open a Pull Request](#prs)_
+
+_report a bug! ➡️ [open an Issue](#issues)_
+
+_fix a bug! ➡️ [open a Pull Request](#prs)_
+
+_implement a new feature! ➡️ [open an Issue to discuss it first, then a Pull Request](#issues)_
+
+<a name="#src"></a>
+### Working on the source code
+
+`rustlings` is basically a glorified `rustc` wrapper. Therefore the source code
+isn't really that complicated since the bulk of the work is done by `rustc`.
+`src/main.rs` contains a simple `clap` CLI that loads from `src/verify.rs` and `src/run.rs`.
+
+<a name="addex"></a>
+### Adding an exercise
+
+First step is to add the exercise! Call it `exercises/yourTopic/yourTopicN.rs`, make sure to
+put in some helpful links, and link to sections of the book in `exercises/yourTopic/README.md`.
+
+Next you want to make sure it runs when using `rustlings`. All exercises are stored in `info.toml`, under the `exercises` array. They're ordered by the order they're ran when using `rustlings verify`.
+
+You want to make sure where in the file you add your exercise. If you're not sure, add it at the bottom and ask in your pull request. To add an exercise, edit the file like this:
+```diff
+  ...
+ [[exercises]]
+ path = "exercises/yourTopic/yourTopicN.rs"
+ mode = "compile"
+  ...
+```
+
+The `mode` attribute decides whether Rustlings will only compile your exercise, or compile and test it. If you have tests to verify in your exercise, choose `test`, otherwise `compile`.
+
+That's all! Feel free to put up a pull request.
+
+<a name="issues"></a>
+### Issues
+
+You can open an issue [here](https://github.com/rust-lang/rustlings/issues/new).
+If you're reporting a bug, please include the output of the following commands:
+
+- `rustc --version`
+- `rustlings --version`
+- `ls -la`
+- Your OS name and version
+
+<a name="prs"></a>
+### Pull Requests
+
+Opening a pull request is as easy as forking the repository and committing your
+changes. There's a couple of things to watch out for:
+
+#### Write correct commit messages
+
+We follow the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0-beta.4/)
+specification, because it makes it easier to generate changelogs automatically.
+This means that you have to format your commit messages in a specific way. Say
+you're working on adding a new exercise called `foobar1.rs`. You could write
+the following commit message:
+
+```
+feat: Add foobar1.rs exercise
+```
+
+If you're just fixing a bug, please use the `fix` type:
+
+```
+fix(verify): Make sure verify doesn't self-destruct
+```
+
+The scope within the brackets is optional, but should be any of these:
+
+- `installation` (for the installation script)
+- `cli` (for general CLI changes)
+- `verify` (for the verification source file)
+- `watch` (for the watch functionality source)
+- `run` (for the run functionality source)
+- `EXERCISENAME` (if you're changing a specific exercise, or set of exercises,
+  substitute them here)
+
+When the commit also happens to close an existing issue, link it in the message
+body:
+
+```
+fix: Update foobar
+
+closes #101029908
+```
+
+If you're doing simple changes, like updating a book link, use `chore`:
+
+```
+chore: Update exercise1.rs book link
+```
+
+If you're updating documentation, use `docs`:
+
+```
+docs: Add more information to Readme
+```
+
+If, and only if, you're absolutely sure you want to make a breaking change
+(please discuss this beforehand!), add an exclamation mark to the type and
+explain the breaking change in the message body:
+
+```
+fix!: Completely change verification
+
+BREAKING CHANGE: This has to be done because lorem ipsum dolor
+```
+
+#### Pull Request Workflow
+
+Once you open a Pull Request, it may be reviewed or labeled (or both) until
+the maintainers accept your change. Then, [bors](https://github.com/bors) will
+run the test suite with your changes and if it's successful, automatically
+merge it in!
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,10 +1,5 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-[[package]]
-name = "adler32"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "aho-corasick"
 version = "0.6.10"
@@ -55,44 +50,11 @@ name = "autocfg"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"

-[[package]]
-name = "base64"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "bincode"
-version = "1.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "bitflags"
 version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"

-[[package]]
-name = "build_const"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "byteorder"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "cc"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "cfg-if"
 version = "0.1.9"
@@ -175,22 +137,6 @@ dependencies = [
 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

-[[package]]
-name = "crc"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "difference"
 version = "2.0.0"
@@ -222,22 +168,6 @@ dependencies = [
 "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

-[[package]]
-name = "flate2"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
- "miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "fsevent"
 version = "0.4.0"
@@ -274,14 +204,6 @@ name = "fuchsia-zircon-sys"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"

-[[package]]
-name = "humantime"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "indicatif"
 version = "0.9.0"
@@ -354,19 +276,6 @@ name = "libc"
 version = "0.2.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"

-[[package]]
-name = "line-wrap"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "linked-hash-map"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "lock_api"
 version = "0.2.0"
@@ -388,34 +297,6 @@ name = "memchr"
 version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"

-[[package]]
-name = "miniz-sys"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "miniz_oxide_c_api"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
- "miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "mio"
 version = "0.6.19"
@@ -488,26 +369,6 @@ name = "numtoa"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"

-[[package]]
-name = "onig"
-version = "4.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
- "onig_sys 69.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "onig_sys"
-version = "69.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.8.0"
@@ -533,24 +394,6 @@ dependencies = [
 "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

-[[package]]
-name = "pkg-config"
-version = "0.3.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "plist"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "line-wrap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
- "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "predicates"
 version = "1.0.1"
@@ -582,11 +425,6 @@ dependencies = [
 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

-[[package]]
-name = "quick-error"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "quote"
 version = "0.6.12"
@@ -762,7 +600,7 @@ dependencies = [

 [[package]]
 name = "rustlings"
-version = "1.2.2"
+version = "1.4.1"
 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)",
@@ -770,7 +608,6 @@ dependencies = [
 "indicatif 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "notify 4.0.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
- "syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -779,11 +616,6 @@ name = "ryu"
 version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"

-[[package]]
-name = "safemem"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
 [[package]]
 name = "same-file"
 version = "1.0.4"
@@ -863,27 +695,6 @@ dependencies = [
 "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

-[[package]]
-name = "syntect"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "onig 4.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "plist 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
- "walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "termion"
 version = "1.5.2"
@@ -1013,33 +824,14 @@ dependencies = [
 "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

-[[package]]
-name = "xml-rs"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "yaml-rust"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [metadata]
-"checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c"
 "checksum aho-corasick 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5"
 "checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c"
 "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
 "checksum assert_cmd 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2dc477793bd82ec39799b6f6b3df64938532fdf2ab0d49ef817eac65856a5a1e"
 "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652"
 "checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf"
-"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e"
-"checksum bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9f04a5e50dc80b3d5d35320889053637d15011aed5e66b66b37ae798c65da6f7"
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
-"checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39"
-"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb"
-"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d"
 "checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
 "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
 "checksum clicolors-control 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f84dec9bc083ce2503908cd305af98bd363da6f54bf8d4bf0ac14ee749ad5d1"
@@ -1047,20 +839,15 @@ dependencies = [
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 "checksum console 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ecd48adf136733979b49e15bc3b4c43cc0d3c85ece7bd08e6daa414c6fcb13e6"
 "checksum console 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2bf3720d3f3fc30b721ef1ae54e13af3264af4af39dc476a8de56a6ee1e2184b"
-"checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb"
-"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
 "checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
 "checksum encode_unicode 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "90b2c9496c001e8cb61827acdefad780795c42264c137744cae6f7d9e3450abd"
 "checksum escargot 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ceb9adbf9874d5d028b5e4c5739d22b71988252b25c9c98fe7cf9738bee84597"
 "checksum filetime 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2f8c63033fcba1f51ef744505b3cad42510432b904c062afa67ad7ece008429d"
-"checksum flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f87e68aa82b2de08a6e037f1385455759df6e445a8df5e005b4297191dbf18aa"
-"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 "checksum fsevent 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6"
 "checksum fsevent-sys 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0"
 "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
 "checksum indicatif 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a29b2fa6f00010c268bface64c18bb0310aaa70d46a195d5382d288c477fb016"
 "checksum inotify 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40b54539f3910d6f84fbf9a643efd6e3aa6e4f001426c0329576128255994718"
 "checksum inotify-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e74a1aa87c59aeff6ef2cc2fa62d41bc43f54952f55652656b18a02fd5e356c0"
@@ -1071,31 +858,21 @@ dependencies = [
 "checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
 "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 "checksum libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "6281b86796ba5e4366000be6e9e18bf35580adf9e63fbe2294aadb587613a319"
-"checksum line-wrap 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9"
-"checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
 "checksum lock_api 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ed946d4529956a20f2d63ebe1b69996d5a2137c91913fe3ebbeff957f5bca7ff"
 "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
 "checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
-"checksum miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202"
-"checksum miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c468f2369f07d651a5d0bb2c9079f8488a66d5466efe42d0c5c6466edcb7f71e"
-"checksum miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b7fe927a42e3807ef71defb191dc87d4e24479b221e67015fe38ae2b7b447bab"
 "checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23"
 "checksum mio-extras 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "46e73a04c2fa6250b8d802134d56d554a9ec2922bf977777c805ea5def61ce40"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
 "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum notify 4.0.12 (registry+https://github.com/rust-lang/crates.io-index)" = "3572d71f13ea8ed41867accd971fd564aa75934cf7a1fae03ddb8c74a8a49943"
 "checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
-"checksum onig 4.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a646989adad8a19f49be2090374712931c3a59835cb5277b4530f48b417f26e7"
-"checksum onig_sys 69.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388410bf5fa341f10e58e6db3975f4bea1ac30247dd79d37a9e5ced3cb4cc3b0"
 "checksum parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fa7767817701cce701d5585b9c4db3cdd02086398322c1d7e8bf5094a96a2ce7"
 "checksum parking_lot_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cb88cb1cb3790baa6776844f968fea3be44956cf184fa1be5a03341f5491278c"
-"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c"
-"checksum plist 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f4739851c08dd9a62a78beff2edf1a438517268b2c563c42fc6d9d3139e42d2a"
 "checksum predicates 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "53e09015b0d3f5a0ec2d4428f7559bb7b3fff341b4e159fedd1d57fac8b939ff"
 "checksum predicates-core 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178"
 "checksum predicates-tree 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124"
 "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
 "checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db"
 "checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca"
 "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef"
@@ -1116,7 +893,6 @@ dependencies = [
 "checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f"
-"checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9"
 "checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267"
 "checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
@@ -1128,7 +904,6 @@ dependencies = [
 "checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be"
 "checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 "checksum syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)" = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe"
-"checksum syntect 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e80b8831c5a543192ffc3727f01cf0e57579c6ac15558e3048bfb5708892167b"
 "checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea"
 "checksum termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "72b620c5ea021d75a735c943269bb07d30c9b77d6ac6b236bc8b5c496ef05625"
 "checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
@@ -1148,5 +923,3 @@ dependencies = [
 "checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9"
 "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-"checksum xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5"
-"checksum yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "rustlings"
-version = "1.3.0"
-authors = ["Olivia <819880950@qq.com>", "Carol (Nichols || Goulding) <carol.nichols@gmail.com"]
+version = "1.5.0"
+authors = ["Marisa <mokou@posteo.de>", "Carol (Nichols || Goulding) <carol.nichols@gmail.com"]
 edition = "2018"

 [dependencies]
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![crab pet](http://i.imgur.com/LbZJgmm.gif) 
+![crab pet](https://i.imgur.com/LbZJgmm.gif)

 # rustlings 🦀❤️

@@ -31,36 +31,51 @@ curl -L https://git.io/rustlings | bash -s mypath/

 This will install Rustlings and give you access to the `rustlings` command. Run it to get started!

-## Windows/Manually
+## Windows
+
+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
+```
+
+To install Rustlings. Same as on MacOS/Linux, you will have access to the `rustlings` command after it.
+
+## Manually

 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/1.0.0 # or whatever the latest version is (find out at https://github.com/rust-lang/rustlings/releases/latest)
+git checkout tags/1.5.0 # or whatever the latest version is (find out at https://github.com/rust-lang/rustlings/releases/latest)
 cargo install --force --path .
 ```

-Same as above, run `rustlings` to get started.
+If there are installation errors, ensure that your toolchain is up to date. For the latest, run:
+```bash
+rustup update
+```
+
+Then, same as above, run `rustlings` to get started.

 ## Doing exercises

-The exercises are sorted by topic and can be found in the subdirectory `rustlings/exercises/<topic>`. For every topic there is an additional README file with some resources to get you started on the topic. We really recommend that you have a look at them before you start. 
+The exercises are sorted by topic and can be found in the subdirectory `rustlings/exercises/<topic>`. For every topic there is an additional README file with some resources to get you started on the topic. We really recommend that you have a look at them before you start.

-The task is simple. Most exercises contain an error that keep it from compiling, and it's up to you to fix it! Some exercises are also ran as tests, but rustlings handles them all the same. To run the exercises in the recommended order, execute:
-
-```bash
-rustlings verify
-```
-
-This will try to verify the completion of every exercise in a predetermined order (what we think is best for newcomers). If you don't want to rerun `verify` every time you change a file, you can run:
+The task is simple. Most exercises contain an error that keep it from compiling, and it's up to you to fix it! Some exercises are also run as tests, but rustlings handles them all the same. To run the exercises in the recommended order, execute:

 ```bash
 rustlings watch
 ```

-This will do the same as verify, but won't quit after running and instead automatically rerun as soon as you change a file in the `exercises/` directory.
+This will try to verify the completion of every exercise in a predetermined order (what we think is best for newcomers). It will also rerun automatically every time you change a file in the `exercises/` directory. If you want to only run it once, you can use:
+
+```bash
+rustlings verify
+```
+
+This will do the same as watch, but it'll quit after running.

 In case you want to go by your own order, or want to only verify a single exercise, you can run:

@@ -94,31 +109,7 @@ If you are interested in improving or adding new ones, please feel free to contr

 ## Contributing

-### Adding an exercise
-
-First step is to add the exercise! Call it `exercises/yourTopic/yourTopicN.rs`, make sure to
-put in some helpful links, and link to sections of the book in `exercises/yourTopic/README.md`.
-
-Next you want to make sure it runs when using `rustlings`. All exercises are stored in `info.toml`, under the `exercises` array. They're ordered by the order they're ran when using `rustlings verify`.
-
-You want to make sure where in the file you add your exercise. If you're not sure, add it at the bottom and ask in your pull request. To add an exercise, edit the file like this:
-```diff
-  ...
-+ [[exercises]]
-+ path = "exercises/yourTopic/yourTopicN.rs"
-+ mode = "compile"
-  ...
-```
-
-The `mode` attribute decides whether Rustlings will only compile your exercise, or compile and test it. If you have tests to verify in your exercise, choose `test`, otherwise `compile`.
-
-That's all! Feel free to put up a pull request.
-
-### Working on the source code
-
-`rustlings` is basically a glorified `rustc` wrapper. Therefore the source code
-isn't really that complicated since the bulk of the work is done by `rustc`.
-`src/main.rs` contains a simple `clap` CLI that loads from `src/verify.rs` and `src/run.rs`.
+See [CONTRIBUTING.md](./CONTRIBUTING.md).

 ## Credits

--- a/default_out.txt
+++ b/default_out.txt
@@ -9,10 +9,10 @@ Let's make sure you're up to speed:
 - You have installed Rust language support for your editor
 - You have locally installed the `rustlings` command by running:

-cargo install --path .
+cargo install --force --path .

 If you've done all of this (or even most of it), congrats! You're ready
 to start working with Rust.

-To get started, run `rustlings verify` in order to get the first exercise.
-Make sure to have your editor open!
+To get started, run `rustlings watch` in order to get the first exercise.
+Make sure to have your editor open!
--- a/exercises/enums/README.md
+++ b/exercises/enums/README.md
@@ -0,0 +1,7 @@
+### Enums
+
+Rust allows you to define a type called `enums` which allow you to enumerate possible values. In combination with enums, we have the concept of `pattern matching` in Rust, which makes it easy to run different code for different values of an enumeration. Enums, while available in many languages, Rust's enums are most similar to `algebraic data types` in functional languages, such as F#, OCaml, and Haskell.
+
+#### Book Sections
+
+- [Enums](https://doc.rust-lang.org/book/ch06-00-enums.html)
--- a/exercises/enums/enums1.rs
+++ b/exercises/enums/enums1.rs
@@ -0,0 +1,42 @@
+// enums1.rs
+// Make me compile! Scroll down for hints!
+
+#[derive(Debug)]
+enum Message {
+    // TODO: define a few types of messages as used below
+}
+
+fn main() {
+    println!("{:?}", Message::Quit);
+    println!("{:?}", Message::Echo);
+    println!("{:?}", Message::Move);
+    println!("{:?}", Message::ChangeColor);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// Hint: The declaration of the enumeration type has not been defined yet.
--- a/exercises/enums/enums2.rs
+++ b/exercises/enums/enums2.rs
@@ -0,0 +1,61 @@
+// enums2.rs
+// Make me compile! Scroll down for hints
+
+#[derive(Debug)]
+enum Message {
+    // TODO: define the different variants used below
+}
+
+impl Message {
+    fn call(&self) {
+        println!("{:?}", &self);
+    }
+}
+
+fn main() {
+    let messages = [
+        Message::Move{ x: 10, y: 30 },
+        Message::Echo(String::from("hello world")),
+        Message::ChangeColor(200, 255, 255),
+        Message::Quit
+    ];
+
+    for message in &messages {
+        message.call();
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// Hint: you can create enumerations that have different variants with different types
+// such as no data, anonymous structs, a single string, tuples, ...etc
--- a/exercises/enums/enums3.rs
+++ b/exercises/enums/enums3.rs
@@ -0,0 +1,63 @@
+// enums3.rs
+// Address all the TODOs to make the tests pass!
+
+enum Message {
+    // TODO: implement the message variant types based on their usage below
+}
+
+struct Point {
+    x: u8,
+    y: u8
+}
+
+struct State {
+    color: (u8, u8, u8),
+    position: Point,
+    quit: bool
+}
+
+impl State {
+    fn change_color(&mut self, color: (u8, u8, u8)) {
+        self.color = color;
+    }
+
+    fn quit(&mut self) {
+        self.quit = true;
+    }
+
+    fn echo(&self, s: String) {
+        println!("{}", s);
+    }
+
+    fn move_position(&mut self, p: Point) {
+        self.position = p;
+    }
+
+    fn process(&mut self, message: Message) {
+        // TODO: create a match expression to process the different message variants
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_match_message_call() {
+        let mut state = State{
+            quit: false,
+            position: Point{ x: 0, y: 0 },
+            color: (0, 0, 0)
+        };
+        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::Quit);
+
+        assert_eq!(state.color, (255, 0, 255));
+        assert_eq!(state.position.x, 10);
+        assert_eq!(state.position.y, 15);
+        assert_eq!(state.quit, true);
+    }
+
+}
--- a/exercises/error_handling/errorsn.rs
+++ b/exercises/error_handling/errorsn.rs
@@ -20,7 +20,7 @@ use std::fmt;
 use std::io;

 // PositiveNonzeroInteger is a struct defined below the tests.
-fn read_and_validate(b: &mut io::BufRead) -> Result<PositiveNonzeroInteger, ???> {
+fn read_and_validate(b: &mut dyn io::BufRead) -> Result<PositiveNonzeroInteger, ???> {
    let mut line = String::new();
    b.read_line(&mut line);
    let num: i64 = line.trim().parse();
@@ -29,7 +29,7 @@ fn read_and_validate(b: &mut io::BufRead) -> Result<PositiveNonzeroInteger, ???>
 }

 // This is a test helper function that turns a &str into a BufReader.
-fn test_with_str(s: &str) -> Result<PositiveNonzeroInteger, Box<error::Error>> {
+fn test_with_str(s: &str) -> Result<PositiveNonzeroInteger, Box<dyn error::Error>> {
    let mut b = io::BufReader::new(s.as_bytes());
    read_and_validate(&mut b)
 }
@@ -98,7 +98,7 @@ enum CreationError {

 impl fmt::Display for CreationError {
    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str((self as &error::Error).description())
+        f.write_str((self as &dyn error::Error).description())
    }
 }

@@ -190,12 +190,12 @@ impl error::Error for CreationError {


 // Another hint: under the hood, the `?` operator calls `From::from`
-// on the error value to convert it to a boxed trait object, a Box<error::Error>,
+// on the error value to convert it to a boxed trait object, a Box<dyn error::Error>,
 // which is polymorphic-- that means that lots of different kinds of errors
 // can be returned from the same function because all errors act the same
 // since they all implement the `error::Error` trait.
 // Check out this section of the book:
-// https://doc.rust-lang.org/stable/book/second-edition/ch09-02-recoverable-errors-with-result.html#a-shortcut-for-propagating-errors-the--operator
+// https://doc.rust-lang.org/book/ch09-02-recoverable-errors-with-result.html#a-shortcut-for-propagating-errors-the--operator



--- a/exercises/error_handling/option1.rs
+++ b/exercises/error_handling/option1.rs
@@ -4,7 +4,7 @@
 // on `None`. Handle this in a more graceful way than calling `unwrap`!
 // Scroll down for hints :)

-fn main() {
+pub fn pop_too_much() -> bool {
    let mut list = vec![3];

    let last = list.pop().unwrap();
@@ -15,9 +15,18 @@ fn main() {
        "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/functions/README.md
+++ b/exercises/functions/README.md
@@ -4,4 +4,4 @@ Here, you'll learn how to write functions and how Rust's compiler can trace thin

 #### Book Sections

- [How Functions Work](https://doc.rust-lang.org/stable/book/ch03-03-how-functions-work.html)
+- [How Functions Work](https://doc.rust-lang.org/book/ch03-03-how-functions-work.html)
--- a/exercises/functions/functions5.rs
+++ b/exercises/functions/functions5.rs
@@ -40,7 +40,7 @@ fn square(num: i32) -> i32 {

 // This is a really common error that can be fixed by removing one character.
 // It happens because Rust distinguishes between expressions and statements: expressions return
-// a value based on its operand, and statements simply return a () type which behaves just like `void` in C/C++ language. 
+// a value based on its operand, and statements simply return a () type which behaves just like `void` in C/C++ language.
 // We want to return a value of `i32` type from the `square` function, but it is returning a `()` type...
 // They are not the same. There are two solutions:
 // 1. Add a `return` ahead of `num * num;`
--- a/exercises/if/README.md
+++ b/exercises/if/README.md
@@ -4,4 +4,4 @@

 #### Book Sections

- [Control Flow - if expressions](https://doc.rust-lang.org/stable/book/ch03-05-control-flow.html#if-expressions)
+- [Control Flow - if expressions](https://doc.rust-lang.org/book/ch03-05-control-flow.html#if-expressions)
--- a/exercises/if/if1.rs
+++ b/exercises/if/if1.rs
@@ -1,6 +1,6 @@
 // if1.rs

-pub fn bigger(a: i32, b:i32) -> i32 {
+pub fn bigger(a: i32, b: i32) -> i32 {
    // Complete this function to return the bigger number!
    // Do not use:
    // - return
--- a/exercises/macros/README.md
+++ b/exercises/macros/README.md
@@ -6,5 +6,5 @@ modules, instead we'll show you how to use and create them.

 #### Book Sections

- [Macros](https://doc.rust-lang.org/stable/book/ch19-06-macros.html)
+- [Macros](https://doc.rust-lang.org/book/ch19-06-macros.html)
 - [The Little Book of Rust Macros](https://danielkeep.github.io/tlborm/book/index.html)
--- a/exercises/modules/README.md
+++ b/exercises/modules/README.md
@@ -4,4 +4,4 @@ In this section we'll give you an introduction to Rust's module system.

 #### Book Sections

- [The Module System](https://doc.rust-lang.org/stable/book/ch07-02-defining-modules-to-control-scope-and-privacy.html)
+- [The Module System](https://doc.rust-lang.org/book/ch07-02-defining-modules-to-control-scope-and-privacy.html)
--- a/exercises/modules/modules2.rs
+++ b/exercises/modules/modules2.rs
@@ -1,7 +1,7 @@
 // modules2.rs
 // Make me compile! Scroll down for hints :)

-mod delicious_snacks { 
+mod delicious_snacks {
    use self::fruits::PEAR as fruit;
    use self::veggies::CUCUMBER as veggie;

@@ -17,9 +17,11 @@ mod delicious_snacks {
 }

 fn main() {
-    println!("favorite snacks: {} and {}",
-             delicious_snacks::fruit,
-             delicious_snacks::veggie);
+    println!(
+        "favorite snacks: {} and {}",
+        delicious_snacks::fruit,
+        delicious_snacks::veggie
+    );
 }


--- a/exercises/move_semantics/README.md
+++ b/exercises/move_semantics/README.md
@@ -6,5 +6,5 @@ These exercises are adapted from [pnkfelix](https://github.com/pnkfelix)'s [Rust

 For this section, the book links are especially important.

- [Ownership](https://doc.rust-lang.org/stable/book/ch04-01-what-is-ownership.html)
- [Reference and borrowing](https://doc.rust-lang.org/stable/book/ch04-02-references-and-borrowing.html)
+- [Ownership](https://doc.rust-lang.org/book/ch04-01-what-is-ownership.html)
+- [Reference and borrowing](https://doc.rust-lang.org/book/ch04-02-references-and-borrowing.html)
--- a/exercises/move_semantics/move_semantics1.rs
+++ b/exercises/move_semantics/move_semantics1.rs
@@ -11,7 +11,6 @@ fn main() {
    vec1.push(88);

    println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
-
 }

 fn fill_vec(vec: Vec<i32>) -> Vec<i32> {
--- a/exercises/move_semantics/move_semantics2.rs
+++ b/exercises/move_semantics/move_semantics2.rs
@@ -12,7 +12,6 @@ fn main() {
    vec1.push(88);

    println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
-
 }

 fn fill_vec(vec: Vec<i32>) -> Vec<i32> {
--- a/exercises/move_semantics/move_semantics3.rs
+++ b/exercises/move_semantics/move_semantics3.rs
@@ -13,7 +13,6 @@ fn main() {
    vec1.push(88);

    println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
-
 }

 fn fill_vec(vec: Vec<i32>) -> Vec<i32> {
--- a/exercises/move_semantics/move_semantics4.rs
+++ b/exercises/move_semantics/move_semantics4.rs
@@ -13,7 +13,6 @@ fn main() {
    vec1.push(88);

    println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
-
 }

 // `fill_vec()` no longer take `vec: Vec<i32>` as argument
--- a/exercises/primitive_types/README.md
+++ b/exercises/primitive_types/README.md
@@ -6,3 +6,4 @@ compiler. In this section, we'll go through the most important ones.
 #### Book Sections

 - [Data Types](https://doc.rust-lang.org/stable/book/ch03-02-data-types.html)
+- [The Slice Type](https://doc.rust-lang.org/stable/book/ch04-03-slices.html)
--- a/exercises/primitive_types/primitive_types4.rs
+++ b/exercises/primitive_types/primitive_types4.rs
@@ -2,16 +2,13 @@
 // Get a slice out of Array a where the ??? is so that the `if` statement
 // returns true. Scroll down for hints!!

+#[test]
 fn main() {
    let a = [1, 2, 3, 4, 5];

    let nice_slice = ???

-    if nice_slice == [2, 3, 4] {
-        println!("Nice slice!");
-    } else {
-        println!("Not quite what I was expecting... I see: {:?}", nice_slice);
-    }
+    assert_eq!([2, 3, 4], nice_slice)
 }


@@ -33,6 +30,28 @@ fn main() {



+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+



--- a/exercises/primitive_types/primitive_types5.rs
+++ b/exercises/primitive_types/primitive_types5.rs
@@ -39,7 +39,7 @@ fn main() {


 // Take a look at the Data Types -> The Tuple Type section of the book:
-// https://doc.rust-lang.org/stable/book/ch03-02-data-types.html#the-tuple-type
-// Particularly the part about destructuring (second to last example in the section). 
+// https://doc.rust-lang.org/book/ch03-02-data-types.html#the-tuple-type
+// Particularly the part about destructuring (second to last example in the section).
 // You'll need to make a pattern to bind `name` and `age` to the appropriate parts
 // of the tuple. You can do it!!
--- a/exercises/primitive_types/primitive_types6.rs
+++ b/exercises/primitive_types/primitive_types6.rs
@@ -38,8 +38,8 @@ fn main() {



-// While you could use a destructuring `let` for the tuple here, try 
-// indexing into it instead, as explained in the last example of the 
+// While you could use a destructuring `let` for the tuple here, try
+// indexing into it instead, as explained in the last example of the
 // Data Types -> The Tuple Type section of the book:
-// https://doc.rust-lang.org/stable/book/ch03-02-data-types.html#the-tuple-type
+// https://doc.rust-lang.org/book/ch03-02-data-types.html#the-tuple-type
 // Now you have another tool in your toolbox!
--- a/exercises/standard_library_types/arc1.rs
+++ b/exercises/standard_library_types/arc1.rs
@@ -13,8 +13,7 @@ fn main() {
    let mut joinhandles = Vec::new();

    for offset in 0..8 {
-        joinhandles.push(
-        thread::spawn(move || {
+        joinhandles.push(thread::spawn(move || {
            let mut i = offset;
            let mut sum = 0;
            while i < child_numbers.len() {
--- a/exercises/standard_library_types/iterators2.rs
+++ b/exercises/standard_library_types/iterators2.rs
@@ -0,0 +1,145 @@
+// 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
+// As always, there are hints below!
+
+pub fn capitalize_first(input: &str) -> String {
+    let mut c = input.chars();
+    match c.next() {
+        None => String::new(),
+        Some(first) => first.collect::<String>() + c.as_str(),
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    // Step 1.
+    // Tests that verify your `capitalize_first` function implementation
+    #[test]
+    fn test_success() {
+        assert_eq!(capitalize_first("hello"), "Hello");
+    }
+
+    #[test]
+    fn test_empty() {
+        assert_eq!(capitalize_first(""), "");
+    }
+
+    // Step 2.
+    #[test]
+    fn test_iterate_string_vec() {
+        let words = vec!["hello", "world"];
+        let capitalized_words: Vec<String> = // TODO
+        assert_eq!(capitalized_words, ["Hello", "World"]);
+    }
+
+    #[test]
+    fn test_iterate_into_string() {
+        let words = vec!["hello", " ", "world"];
+        let capitalized_words = // TODO
+        assert_eq!(capitalized_words, "Hello World");
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// Step 1
+// You need to call something on `first` before it can be collected
+// Currently its type is `char`. Have a look at the methods that are available on that type:
+// https://doc.rust-lang.org/std/primitive.char.html
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// Step 2
+// First you'll need to turn the Vec into an iterator
+// Then you'll need to apply your function unto each item in the vector
+// P.s. Don't forget to collect() at the end!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// Step 3.
+// This is very similar to the previous test. The only real change is that you will need to
+// alter the type that collect is coerced into. For a bonus you could try doing this with a
+// turbofish
--- a/exercises/standard_library_types/iterators3.rs
+++ b/exercises/standard_library_types/iterators3.rs
@@ -1,4 +1,4 @@
-// iterator3.rs
+// iterators3.rs
 // This is a bigger exercise than most of the others! You can do it!
 // Here is your mission, should you choose to accept it:
 // 1. Complete the divide function to get the first four tests to pass
@@ -23,8 +23,7 @@ pub struct NotDivisibleError {
 // This function should calculate `a` divided by `b` if `a` is
 // evenly divisible by b.
 // Otherwise, it should return a suitable error.
-pub fn divide(a: i32, b: i32) -> Result<i32, DivisionError> {
-}
+pub fn divide(a: i32, b: i32) -> Result<i32, DivisionError> {}

 #[cfg(test)]
 mod tests {
@@ -40,7 +39,7 @@ mod tests {
    fn test_not_divisible() {
        assert_eq!(
            divide(81, 6),
-            Err(DivisionError::NotDivisible(NotDivisibleError{
+            Err(DivisionError::NotDivisible(NotDivisibleError {
                dividend: 81,
                divisor: 6
            }))
--- a/exercises/strings/README.md
+++ b/exercises/strings/README.md
@@ -6,4 +6,4 @@ to identify and create them, as well as use them.

 #### Book Sections

- [Strings](https://doc.rust-lang.org/stable/book/ch08-02-strings.html)
+- [Strings](https://doc.rust-lang.org/book/ch08-02-strings.html)
--- a/exercises/structs/README.md
+++ b/exercises/structs/README.md
@@ -1,4 +1,4 @@
-### Strings
+### Structs

 Rust has three struct types: a classic c struct, a tuple struct, and a unit struct.

--- a/exercises/structs/structs1.rs
+++ b/exercises/structs/structs1.rs
@@ -7,7 +7,8 @@ struct ColorClassicStruct {

 struct ColorTupleStruct(/* TODO: Something goes here */);

-struct ColorUnitStruct;
+#[derive(Debug)]
+struct UnitStruct;

 #[cfg(test)]
 mod tests {
@@ -35,12 +36,9 @@ mod tests {
    #[test]
    fn unit_structs() {
        // TODO: Instantiate a unit struct!
-        // let green =
+        // let unit_struct =
+        let message = format!("{:?}s are fun!", unit_struct);

-        if let ColorUnitStruct = green {
-            assert!(true);
-        } else {
-            assert!(false);
-        }
+        assert_eq!(message, "UnitStructs are fun!");
    }
 }
--- a/exercises/structs/structs2.rs
+++ b/exercises/structs/structs2.rs
@@ -0,0 +1,45 @@
+// structs2.rs
+// Address all the TODOs to make the tests pass!
+// No hints, just do it!
+
+#[derive(Debug)]
+struct Order {
+    name: String,
+    year: u32,
+    made_by_phone: bool,
+    made_by_mobile: bool,
+    made_by_email: bool,
+    item_number: u32,
+    count: u32,
+}
+
+fn create_order_template() -> Order {
+    Order {
+        name: String::from("Bob"),
+        year: 2019,
+        made_by_phone: false,
+        made_by_mobile: false,
+        made_by_email: true,
+        item_number: 123,
+        count: 0,
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn your_order() {
+        let order_template = create_order_template();
+        // TODO: Create your own order using the update syntax and template above!
+        // let your_order =
+        assert_eq!(your_order.name, "Hacker in Rust");
+        assert_eq!(your_order.year, order_template.year);
+        assert_eq!(your_order.made_by_phone, order_template.made_by_phone);
+        assert_eq!(your_order.made_by_mobile, order_template.made_by_mobile);
+        assert_eq!(your_order.made_by_email, order_template.made_by_email);
+        assert_eq!(your_order.item_number, order_template.item_number);
+        assert_eq!(your_order.count, 1);
+    }
+}
--- a/exercises/test1.rs
+++ b/exercises/test1.rs
@@ -13,9 +13,9 @@
 // Don't modify this function!
 #[test]
 fn verify_test() {
-    let price1 = calculateprice(55);
-    let price2 = calculateprice(40);
+    let price1 = calculate_apple_price(35);
+    let price2 = calculate_apple_price(65);

-    assert_eq!(price1, 55);
-    assert_eq!(price2, 80);
+    assert_eq!(70, price1);
+    assert_eq!(65, price2);
 }
--- a/exercises/test3.rs
+++ b/exercises/test3.rs
@@ -7,8 +7,12 @@
 // 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!

-fn string_slice(arg: &str) { println!("{}", arg); }
-fn string(arg: String) { println!("{}", arg); }
+fn string_slice(arg: &str) {
+    println!("{}", arg);
+}
+fn string(arg: String) {
+    println!("{}", arg);
+}

 fn main() {
    ("blue");
--- a/exercises/tests/README.md
+++ b/exercises/tests/README.md
@@ -4,4 +4,4 @@ Going out of order from the book to cover tests -- many of the following exercis

 #### Book Sections

- [Writing Tests](https://doc.rust-lang.org/stable/book/ch11-01-writing-tests.html)
+- [Writing Tests](https://doc.rust-lang.org/book/ch11-01-writing-tests.html)
--- a/exercises/threads/threads1.rs
+++ b/exercises/threads/threads1.rs
@@ -45,7 +45,7 @@ fn main() {
 // to **immutable** data. But we want to *change* the number of `jobs_completed`
 // so we'll need to also use another type that will only allow one thread to
 // mutate the data at a time. Take a look at this section of the book:
-// https://doc.rust-lang.org/stable/book/second-edition/ch16-03-shared-state.html#atomic-reference-counting-with-arct
+// https://doc.rust-lang.org/book/ch16-03-shared-state.html#atomic-reference-counting-with-arct
 // and keep scrolling if you'd like more hints :)


--- a/exercises/variables/README.md
+++ b/exercises/variables/README.md
@@ -4,4 +4,4 @@ Here you'll learn about simple variables.

 #### Book Sections

- [Variables and Mutability](https://doc.rust-lang.org/stable/book/ch03-01-variables-and-mutability.html)
+- [Variables and Mutability](https://doc.rust-lang.org/book/ch03-01-variables-and-mutability.html)
--- a/info.toml
+++ b/info.toml
@@ -66,7 +66,7 @@ mode = "compile"

 [[exercises]]
 path = "exercises/primitive_types/primitive_types4.rs"
-mode = "compile"
+mode = "test"

 [[exercises]]
 path = "exercises/primitive_types/primitive_types5.rs"
@@ -82,6 +82,24 @@ mode = "compile"
 path = "exercises/structs/structs1.rs"
 mode = "test"

+[[exercises]]
+path = "exercises/structs/structs2.rs"
+mode = "test"
+
+# ENUMS
+
+[[exercises]]
+path = "exercises/enums/enums1.rs"
+mode = "compile"
+
+[[exercises]]
+path = "exercises/enums/enums2.rs"
+mode = "compile"
+
+[[exercises]]
+path = "exercises/enums/enums3.rs"
+mode = "test"
+
 # TESTS

 [[exercises]]
@@ -192,7 +210,7 @@ mode = "test"

 [[exercises]]
 path = "exercises/error_handling/option1.rs"
-mode = "compile"
+mode = "test"

 [[exercises]]
 path = "exercises/error_handling/result1.rs"
@@ -211,7 +229,11 @@ path = "exercises/standard_library_types/arc1.rs"
 mode = "compile"

 [[exercises]]
-path = "exercises/standard_library_types/iterator3.rs"
+path = "exercises/standard_library_types/iterators2.rs"
+mode = "test"
+
+[[exercises]]
+path = "exercises/standard_library_types/iterators3.rs"
 mode = "test"

 [[exercises]]
--- a/install.ps1
+++ b/install.ps1
@@ -0,0 +1,85 @@
+#!/usr/bin/env pwsh
+
+#Requires -Version 5
+param($path = "$pwd/rustlings")
+
+Write-Host "Let's get you set up with Rustlings!"
+
+Write-Host "Checking requirements..."
+if (Get-Command git -ErrorAction SilentlyContinue) {
+    Write-Host "SUCCESS: Git is installed"
+} else {
+    Write-Host "WARNING: Git does not seem to be installed."
+    Write-Host "Please download Git using your package manager or over https://git-scm.com/!"
+    exit 1
+}
+
+if (Get-Command rustc -ErrorAction SilentlyContinue) {
+    Write-Host "SUCCESS:  Rust is installed"
+} else {
+    Write-Host "WARNING: Rust does not seem to be installed."
+    Write-Host "Please download Rust using https://rustup.rs!"
+    exit 1
+}
+
+if (Get-Command cargo -ErrorAction SilentlyContinue) {
+    Write-Host "SUCCESS: Cargo is installed"
+} else {
+    Write-Host "WARNING: Cargo does not seem to be installed."
+    Write-Host "Please download Rust and Cargo using https://rustup.rs!"
+    exit 1
+}
+
+# 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($v1, $v2) {
+    if ($v1 -eq $v2) {
+       return 0
+    } 
+
+    $v1 = $v1.Replace(".", "0")
+    $v2 = $v2.Replace(".", "0")
+    if ($v1.Length -gt $v2.Length) {
+        $v2 = $v2.PadRight($v1.Length, "0")
+    } else {
+        $v1 = $v1.PadRight($v2.Length, "0")
+    }
+
+    if ($v1 -gt $v2) {
+        return 1
+    } else {
+        return 2
+    }
+}
+
+$rustVersion = $(rustc --version).Split(" ")[1]
+$minRustVersion = "1.31"
+if ((vercomp $rustVersion $minRustVersion) -eq 2) {
+    Write-Host "WARNING: Rust version is too old: $rustVersion - needs at least $minRustVersion"
+    Write-Host "Please update Rust with 'rustup update'"
+    exit 1
+} else {
+    Write-Host "SUCCESS: Rust is up to date"
+}
+
+Write-Host "Cloning Rustlings at $path"
+git clone -q https://github.com/rust-lang/rustlings $path
+if (!($LASTEXITCODE -eq 0)) {
+    exit 1
+}
+
+# UseBasicParsing is deprecated, pwsh 6 or above will automatically use it,
+# 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
+
+Write-Host "Installing the 'rustlings' executable..."
+cargo install --force --path .
+if (!(Get-Command rustlings -ErrorAction SilentlyContinue)) {
+    Write-Host "WARNING: Please check that you have '~/.cargo/bin' in your PATH environment variable!"
+}
+
+Write-Host "All done! Run 'rustlings' to get started."
--- a/install.sh
+++ b/install.sh
@@ -94,10 +94,9 @@ git checkout -q tags/$Version
 echo "Installing the 'rustlings' executable..."
 cargo install --force --path .

-if [ -x "$(rustlings)" ]
+if ! [ -x "$(command -v rustlings)" ]
 then
    echo "WARNING: Please check that you have '~/.cargo/bin' in your PATH environment variable!"
 fi

 echo "All done! Run 'rustlings' to get started."
-
--- a/src/main.rs
+++ b/src/main.rs
@@ -80,6 +80,9 @@ fn main() {
    }

    if matches.subcommand_matches("watch").is_some() {
+        /* Clears the terminal with an ANSI escape code.
+           Works in UNIX and newer Windows terminals. */
+        println!("\x1Bc");
        watch(&exercises).unwrap();
    }

@@ -87,8 +90,6 @@ fn main() {
        let text = fs::read_to_string("default_out.txt").unwrap();
        println!("{}", text);
    }
-
-    println!("\x1b[0m");
 }

 fn watch(exercises: &[Exercise]) -> notify::Result<()> {
@@ -103,7 +104,7 @@ fn watch(exercises: &[Exercise]) -> notify::Result<()> {
        match rx.recv() {
            Ok(event) => match event {
                DebouncedEvent::Create(b) | DebouncedEvent::Chmod(b) | DebouncedEvent::Write(b) => {
-                    if b.extension() == Some(OsStr::new("rs")) {
+                    if b.extension() == Some(OsStr::new("rs")) && b.exists() {
                        println!("----------**********----------\n");
                        let filepath = b.as_path().canonicalize().unwrap();
                        let exercise = exercises
--- a/src/verify.rs
+++ b/src/verify.rs
@@ -19,11 +19,7 @@ fn compile_only(exercise: &Exercise) -> Result<(), ()> {
    let compile_output = exercise.compile();
    progress_bar.finish_and_clear();
    if compile_output.status.success() {
-        let formatstr = format!(
-            "{} Successfully compiled {}!",
-            Emoji("✅", "✓"),
-            exercise
-        );
+        let formatstr = format!("{} Successfully compiled {}!", Emoji("✅", "✓"), exercise);
        println!("{}", style(formatstr).green());
        exercise.clean();
        Ok(())
Author	SHA1	Message	Date
marisa	c8babbad27	1.5.0	2019-11-09 10:52:20 +01:00
bors	c6dad28ddc	Auto merge of #224 - nyxtom:feat-enums, r=fmoko feat: Add enums exercises Creates an exhaustive list of enum exercises. This goes through the basics of different ways to derive enums with mixed data type variants, as well as the use of the all important `match` operator.	2019-11-09 09:41:36 +00:00
bors	fea81419cd	Auto merge of #227 - workingjubilee:watch-clears-terminal, r=fmoko watch: clears terminal before entering loop Fixes #146 If someone is sliding in and out of "watch" mode, it can make it hard to tell which error messages are still relevant. This patch resolves that by clearing the terminal entirely before entering watch's loop. Note that the escape character is chosen for compatibility reasons, because different shells/terminals can change which commands they accept or have installed, betting on what other commands are in use to collect data seems risky, and just expecting them to implement ANSI escape code sequences is more reliable. This seems especially true since Windows is seeking more UNIX compatibility in its terminals going forward, even though it doesn't implement the POSIX standard per se.	2019-11-09 09:31:50 +00:00
Jubilee Young	83be517e77	watch: clears terminal before entering loop If someone is sliding in and out of "watch" mode, it can make it hard to tell which error messages are still relevant. This patch resolves that by clearing the terminal entirely before entering watch's loop.	2019-11-09 00:57:36 -08:00
marisa	79a569422c	fix: Rewrite test1 logic	2019-10-29 20:53:41 +01:00
bors	1e0b12e37e	Auto merge of #225 - ssweeny:fix/test1-wording, r=fmoko chore: Clarify comment in exercises/test1.rs closes #194 The author of issue #194 suggests that the wording of the comment is at least ambiguous about the desired results. I believe this change more clearly describes the expectation of the exercise.	2019-10-29 13:37:30 +00:00
Thomas Holloway	dc15032112	feat: Add enums exercises	2019-10-28 22:49:49 -05:00
Scott Sweeny	2821227acf	chore: Clarify comment in exercises/test1.rs closes #194 The author of issue #194 suggests that the wording of the comment is at least ambiguous about the desired results. I believe this change more clearly describes the expectation of the exercise.	2019-10-28 23:08:46 -04:00
bors	2191ef7eee	Auto merge of #219 - vyaslav:master, r=fmoko Added exercise for struct update syntax Added one exercise for struct update syntax `struct2.rs`	2019-10-28 22:56:54 +00:00
marisa	4c2cf6da75	fix(option1): Fix arguments passed to assert! macro (#222 ) fix(option1): Fix arguments passed to assert! macro	2019-10-26 00:27:40 +02:00
marisa	0f3d6d871e	chore: Bump version in Cargo.lock (#223 ) chore: Bump version in Cargo.lock	2019-10-26 00:27:17 +02:00
Niklas Anderson	bd007d4617	chore: Bump version in Cargo.lock	2019-10-25 14:57:30 -07:00
Niklas Anderson	ead4f7af9e	fix(option1): Fix arguments passed to assert! macro	2019-10-25 14:27:24 -07:00
marisa	4808b5b3ba	Update README to show latest version, for those who copy/paste (#221 ) Update README to show latest version, for those who copy/paste	2019-10-25 01:54:10 +02:00
Mark Provan	f3da6796b9	Update README to show latest version, for those who copy/paste	2019-10-24 13:56:14 +01:00
marisa	cece12e87e	docs: Add automatic Windows support to Readme	2019-10-23 13:01:07 +02:00
marisa	68d1727cac	chore(ci): Remove GitHub actions for now	2019-10-23 12:56:07 +02:00
bors	8a2e13b20a	Auto merge of #220 - gdoenlen:master, r=fmoko Add windows install script Adds a powershell install script for windows users that are at least running powershell 5. It is almost a direct port of install.sh. This would be used to automatically download the script much like curl \| bash, but with: `Invoke-WebRequest https://urltoscript.com \| 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`	2019-10-23 10:49:36 +00:00
George Doenlen	ee311b8e5c	remove execution policy check	2019-10-22 22:26:33 -04:00
George Doenlen	f0de6c4e92	Add basic windows install script. Adds a powershell install script for windows users that are at least running powershell 5. It is almost a direct port of install.sh. This would be used to automatically download the script much like curl \| bash, but with: `Invoke-WebRequest https://urltoscript.com \| 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`	2019-10-22 21:56:50 -04:00
Viacheslav Avramenko	1c4c8764ed	feat: Added exercise for struct update syntax	2019-10-21 14:50:59 +02:00
bors	e6161a6f58	Auto merge of #217 - timthelion:timthelion-readme-run, r=fmoko Tense in README Don't see why run should be past tense. At least in my native General American dialect it shouldn't be.	2019-09-25 14:09:52 +00:00
Timothy Hobbs	8c0fe59c90	Tense in README Don't see why run should be past tense. At least in my native General American dialect it shouldn't be.	2019-09-07 16:17:45 +00:00
komaeda	17690b3add	chore(ci): Add GitHub Actions CI file	2019-08-21 13:23:38 +02:00
bors	f9987c8bed	Auto merge of #212 - sosnowski:fix/add-dyn-trait, r=komaeda fix(errorsn.rs) Update the deprecated syntax by adding dyn to trait o… fix(errorsn.rs) Update the deprecated syntax by adding dyn to trait objects. closes #211 Related issue: https://github.com/rust-lang/rustlings/issues/211	2019-08-21 11:01:11 +00:00
Damian S	8109cbad97	fix(errorsn.rs) Update the deprecated syntax by adding dyn to trait objectscloses #211	2019-08-21 11:44:42 +01:00
bors	c5bb32253b	Auto merge of #209 - Dylnuge:slice-assert, r=komaeda fix(primitive_types4): Fail on a slice covering the wrong area I noticed this issue and it seems like a similar one was raised/fixed in #160 this way. This is my first contribution to this repo (or any Rust project) so let me know if I messed up or need to fix anything! --- This commit converts primitive_types4 to a test and asserts that the slice given is equal to the expected slice. The intent of the primitive_types4 exercise appears to be to ensure the user understands inclusive and exclusive bounds as well as slice syntax. `rustlings` commands using `compile` do not verify that a specific println is reached and, in the case of `watch` and `verify` (but not `run`), they do not output the `println`s at all. This fix is semantically similar to #198. It does not take a stance on the correct way to handle this for all exercises; see #127. There are likely other exercises whose intent are masked by this issue.	2019-08-18 08:24:44 +00:00
Dylan Nugent	5b1e673cec	fix(primitive_types4): Fail on a slice covering the wrong area This commit converts primitive_types4 to a test and asserts that the slice given is equal to the expected slice. The intent of the primitive_types4 exercise appears to be to ensure the user understands inclusive and exclusive bounds as well as slice syntax. `rustlings` commands using `compile` do not verify that a specific println is reached and, in the case of `watch` and `verify` (but not `run`), they do not output the `println`s at all. This fix is semantically similar to #198. It does not take a stance on the correct way to handle this for all exercises; see #127. There are likely other exercises whose intent are masked by this issue.	2019-08-17 17:16:19 -07:00
bors	2cd06826c0	Auto merge of #206 - ajaxm:ajaxm/rustup-update, r=komaeda Suggest rustup update in readme I'm pretty new to Rust. I tried installing rustlings for the first time and got this error: ``` $> cargo install --force --path . error: `/Users/ajax/projects/rust/rustlings` is not a crate root; specify a crate to install from crates.io, or use --path or --git to specify an alternate source Caused by: failed to parse manifest at `/Users/ajax/projects/rust/rustlings/Cargo.toml` Caused by: editions are unstable Caused by: feature `edition` is required this Cargo does not support nightly features, but if you switch to nightly channel you can add `cargo-features = ["edition"]` to enable this feature ``` I'm not sure if the answer was to run `rustup update` but I noticed that I was running Rust 1.29.0, so updated to 1.36.0 and got it working. If there's a way to specify a minimum required version, pls let me know. Lastly, the whitespace changes were automatic from my editor. What's the convention here for making such updates? Thanks!	2019-08-13 10:04:36 +00:00
marisa	4f0c5a8d49	1.4.1	2019-08-13 11:59:17 +02:00
bors	3011251da7	Auto merge of #208 - EnricoMiccoli:patch-1, r=komaeda chore: Correct typo in hint text	2019-08-12 15:24:17 +00:00
Enrico Miccoli	76b4cb5c00	chore: Correct typo	2019-08-12 11:45:40 +02:00
bors	f83af3c25d	Auto merge of #207 - nkanderson:fix_iterators2, r=komaeda Fix iterators2 A couple of small changes to the `iterators2` exercise. @Jesse-Cameron, it looks like you contributed this exercise, so I wanted to check and see if these changes are in line with your intentions. Happy to adjust if they're not :)	2019-08-11 15:44:40 +00:00
Niklas Anderson	e3931718fb	chore(iterators2): Add exercise instructions	2019-08-09 07:38:21 -07:00
Niklas Anderson	4cde86643e	fix(iterators2): Remove syntax resulting in misleading error message closes #199	2019-08-09 07:37:27 -07:00
Ajax Manohar	9ee3207280	docs: Suggest rustup update in readme	2019-08-03 10:49:37 -07:00
bors	e696a07190	Auto merge of #201 - zdzc:patch-1, r=komaeda docs: Fix wrong title fix #200	2019-07-27 19:07:22 +00:00
Andre Pratama	e0db987441	docs: Fix wrong title fix #200	2019-07-27 22:14:48 +07:00
bors	1890b0019d	Auto merge of #198 - nkanderson:160_options1-add-test, r=komaeda fix(option1): Add test for prematurely passing exercise Fixes the bug referenced in #160, but does not address the larger feature work referenced by the issue.	2019-07-27 10:32:47 +00:00
Niklas Anderson	a750e4a1a3	fix(option1): Add test for prematurely passing exercise Fixes the bug referenced in #160, but does not address the larger feature work referenced by the issue.	2019-07-26 16:58:12 -07:00
bors	1c789dda08	Auto merge of #192 - petemcfarlane:patch-2, r=komaeda fix(test1): Swap assertion parameter order `Expected` should come before `actual`, other wise it leads to confusing compiler messages, e.g. ``` note: expected type `()` found type `{integer}` ``` There may be other tests that need updating, but this is as far as I am through the Rustlings course right now :)	2019-07-13 16:27:14 +00:00
Pete McFarlane	4086d463a9	fix(test1): Swap assertion parameter order `Expected` should come before `actual`, other wise it leads to confusing compiler messages, e.g. ``` note: expected type `()` found type `{integer}` ```	2019-07-13 13:31:57 +01:00
marisa	b8368de6d5	1.4.0	2019-07-13 12:50:22 +02:00
bors	7dc90094d2	Auto merge of #191 - MrFroop:master, r=komaeda Fix(watch): Check if changed exercise file exists before calling verify. Prevent a panic if the file triggering the watch event is gone.	2019-07-12 08:16:35 +00:00
Fredrik Jambrén	ba85ca32c4	Check if changed exercise file exists before calling verify.	2019-07-11 23:54:18 +02:00
etisdew	70946b85e5	fix(readme): http to https changing readme image (line 1) to https fixes markdown preview and improves fidelity	2019-07-08 16:58:14 +02:00
bors	1570c328c6	Auto merge of #186 - Jesse-Cameron:iterator-exercise2, r=komaeda feat(iterators2): adds iterators2 exercise including config Hi there! I really enjoyed doing the rustlings exercises so I thought that I would try to add an exercise! This one just covers a couple of basic iterator operations. Getting people used to the `map` and `collect` functions. However, it does feel kinda similar to the next exercise. So I may also revisit some of the tests in iterators3 if we think that is necessary.	2019-07-04 11:35:40 +00:00
Jesse	9288fccf07	feat(iterators2): adds iterators2 exercise including config	2019-07-03 21:06:24 +10:00
bors	5e1d7c3076	Auto merge of #184 - Jesse-Cameron:master, r=komaeda fix(test1): renamed function name to snake case addressing a minor function naming convention, see: [RFC #430](https://doc.rust-lang.org/1.0.0/style/style/naming/README.html) closes #180	2019-06-28 15:27:40 +00:00
Jesse	89d5186c0d	fix(test1): renamed function name to snake case closes #180	2019-06-29 01:00:10 +10:00
bors	aaad60d07e	Auto merge of #172 - miller-time:fix-book-links, r=komaeda chore: Fix a couple broken book links While I was fixing these, I figured maybe it's good to just use a consistent URL for book links: https://doc.rust-lang.org/book/ Is there a plan for what to do with this old 1.4.0 example that doesn't exist in the current version of the book? Perhaps at least include a disclaimer when recommending that folks check it out? `34e31232df/exercises/threads/README.md (L1)`	2019-06-23 10:31:50 +00:00
bors	5f16469807	Auto merge of #171 - miller-time:rustfmt-exercises, r=komaeda chore: Clean up some formatting in exercises I noticed some formatting that isn't consistent with the `rustfmt` style and tried my best to run it on the files in the exercises directory (which does fail for files that can't compile!), which just caught some minor whitespace things here and there. Note: also can't just apply `rustfmt` blindly because of the blank lines that lead to the hint comments	2019-06-23 10:25:48 +00:00
bors	752bc27e2b	Auto merge of #179 - briankung:fix_irrefutable_let_pattern_structs1, r=komaeda Fixes the irrefutable let pattern warning in `structs1.rs` PR https://github.com/rust-lang/rustlings/pull/163 accidentally introduced an error using some versions of the Rust compiler where the compiler would (rightly!) complain about an irrefutable let pattern. I have no idea why this did not occur in all versions of the compiler, but here is a way around it.	2019-06-20 15:02:20 +00:00
Brian Kung	cc6a14104d	Fixes the irrefutable let pattern warning	2019-06-20 09:46:49 -05:00
Russell Cousineau	eb13c2b6af	chore: Clean up some formatting in exercises	2019-06-11 07:14:43 -07:00
Russell Cousineau	63c133e4a3	chore: Fix a couple broken book links	2019-06-11 07:13:05 -07:00
bors	b8d59d699b	Auto merge of #169 - miller-time:fix-install-script, r=komaeda fix(installation): Fix rustlings installation check fixes #147 I did some quick testing with the `-x` check: ```sh if [ -x "$(notrustlings)" ] then echo "notrustlings does not exist" else echo "notrustlings appears to exist!" notrustlings fi ``` which produced: ``` ./test.sh: line 12: notrustlings: command not found notrustlings appears to exist! ./test.sh: line 17: notrustlings: command not found ``` (consistent with comments in issue) Using `if ! [ -x "$(command -v <command>)" ]` appears to be the standard way to perform this type of check.	2019-06-11 13:53:07 +00:00
bors	5586613eec	Auto merge of #170 - miller-time:rename-iterator-exercise, r=komaeda fix(iterators): Rename iterator3.rs fixes #155	2019-06-11 12:53:58 +00:00
bors	ad8e6dc63b	Auto merge of #176 - danwilhelm:dan-minor-text, r=komaeda chore: Minor text updates - Make the default rustlings executable text consistent with the README and install script by adding `--force`. - Remove a missed highlighting character from Issue #133.	2019-06-11 09:38:18 +00:00
Dan Wilhelm	f72e0ca979	chore: Remove missed highlighting char from Issue #133	2019-06-10 20:24:18 -07:00
Dan Wilhelm	03cfe67500	chore: Make install instructions consistent	2019-06-10 20:20:22 -07:00
Russell Cousineau	7a252c4755	fix(installation): Fix rustlings installation check	2019-06-09 07:40:54 -07:00
liv	2089901739	docs: Move content from Readme to Contributing	2019-06-09 14:46:38 +02:00
liv	635e506c16	docs: Recommend `rustlings watch` as default	2019-06-09 14:44:16 +02:00
liv	75d8c7e3cc	docs: Add CONTRIBUTING.md	2019-06-09 14:39:00 +02:00
Rohan Prinja	080d6cdd11	chore: Fix link to Arc<T> in the book	2019-06-09 13:45:53 +02:00
Russell Cousineau	433d2115bc	fix(iterators): Rename iterator3.rs	2019-06-07 14:42:44 -07:00
liv	34e31232df	feat(changelog): Use clog for changelogs	2019-06-05 13:14:51 +02:00