119 changed files with 809 additions and 2013 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@ -2109,330 +2109,6 @@
      "contributions": [
        "content"
      ]
    },
    {
      "login": "Ben2917",
      "name": "Ben",
      "avatar_url": "https://avatars.githubusercontent.com/u/10279994?v=4",
      "profile": "https://github.com/Ben2917",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "b1ue64",
      "name": "b1ue64",
      "avatar_url": "https://avatars.githubusercontent.com/u/77976308?v=4",
      "profile": "https://github.com/b1ue64",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "lazywalker",
      "name": "lazywalker",
      "avatar_url": "https://avatars.githubusercontent.com/u/53956?v=4",
      "profile": "https://github.com/lazywalker",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "proofconstruction",
      "name": "proofconstruction",
      "avatar_url": "https://avatars.githubusercontent.com/u/74747193?v=4",
      "profile": "https://github.com/proofconstruction",
      "contributions": [
        "infra"
      ]
    },
    {
      "login": "IVIURRAY",
      "name": "IVIURRAY",
      "avatar_url": "https://avatars.githubusercontent.com/u/16007179?v=4",
      "profile": "https://www.youtube.com/channel/UCQCjA6qUutAtWqkCA4Z36CQ",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "b-apperlo",
      "name": "Bert Apperlo",
      "avatar_url": "https://avatars.githubusercontent.com/u/91734527?v=4",
      "profile": "https://github.com/b-apperlo",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "FWDekker",
      "name": "Florine W. Dekker",
      "avatar_url": "https://avatars.githubusercontent.com/u/13442533?v=4",
      "profile": "https://fwdekker.com/",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "luhem7",
      "name": "Mehul Gangavelli",
      "avatar_url": "https://avatars.githubusercontent.com/u/4008215?v=4",
      "profile": "https://github.com/luhem7",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "Frosthage",
      "name": "Mikael Frosthage",
      "avatar_url": "https://avatars.githubusercontent.com/u/14823314?v=4",
      "profile": "https://github.com/Frosthage",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "robertefry",
      "name": "Robert Fry",
      "avatar_url": "https://avatars.githubusercontent.com/u/43712054?v=4",
      "profile": "https://robertfry.xyz",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "tajo48",
      "name": "tajo48",
      "avatar_url": "https://avatars.githubusercontent.com/u/55502906?v=4",
      "profile": "https://github.com/tajo48",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "novanish",
      "name": "Anish",
      "avatar_url": "https://avatars.githubusercontent.com/u/98446102?v=4",
      "profile": "https://anishchhetri.com.np",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "vnprc",
      "name": "vnprc",
      "avatar_url": "https://avatars.githubusercontent.com/u/9425366?v=4",
      "profile": "https://github.com/vnprc",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "jrcarl624",
      "name": "Joshua Carlson",
      "avatar_url": "https://avatars.githubusercontent.com/u/61999256?v=4",
      "profile": "http://androecia.net",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "johnDeSilencio",
      "name": "Nicholas R. Smith",
      "avatar_url": "https://avatars.githubusercontent.com/u/20136554?v=4",
      "profile": "https://johndesilencio.me",
      "contributions": [
        "code"
      ]
    },
    {
      "login": "alexfertel",
      "name": "Alexander González",
      "avatar_url": "https://avatars.githubusercontent.com/u/22298999?v=4",
      "profile": "https://alexfertel.me",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "softarn",
      "name": "Marcus Höjvall",
      "avatar_url": "https://avatars.githubusercontent.com/u/517619?v=4",
      "profile": "https://github.com/softarn",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "barlevalon",
      "name": "Alon Hearter",
      "avatar_url": "https://avatars.githubusercontent.com/u/3397911?v=4",
      "profile": "https://github.com/barlevalon",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "shirts",
      "name": "shirts",
      "avatar_url": "https://avatars.githubusercontent.com/u/4952151?v=4",
      "profile": "https://github.com/shirts",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "eLVas",
      "name": "Ivan Vasiunyk",
      "avatar_url": "https://avatars.githubusercontent.com/u/6797156?v=4",
      "profile": "https://github.com/eLVas",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "mo8it",
      "name": "Mo",
      "avatar_url": "https://avatars.githubusercontent.com/u/76752051?v=4",
      "profile": "https://mo8it.com",
      "contributions": [
        "code"
      ]
    },
    {
      "login": "x10an14",
      "name": "x10an14",
      "avatar_url": "https://avatars.githubusercontent.com/u/710608?v=4",
      "profile": "https://github.com/x10an14",
      "contributions": [
        "infra"
      ]
    },
    {
      "login": "gabay",
      "name": "Roi Gabay",
      "avatar_url": "https://avatars.githubusercontent.com/u/5773610?v=4",
      "profile": "https://github.com/gabay",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "mkovaxx",
      "name": "Máté Kovács",
      "avatar_url": "https://avatars.githubusercontent.com/u/481354?v=4",
      "profile": "https://github.com/mkovaxx",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "szabgab",
      "name": "Gábor Szabó",
      "avatar_url": "https://avatars.githubusercontent.com/u/48833?v=4",
      "profile": "https://szabgab.com/",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "yamila-moreno",
      "name": "Yamila Moreno",
      "avatar_url": "https://avatars.githubusercontent.com/u/3340793?v=4",
      "profile": "https://moduslaborandi.net",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "willhack",
      "name": "Will Hack",
      "avatar_url": "https://avatars.githubusercontent.com/u/18036720?v=4",
      "profile": "https://github.com/willhack",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "bean5",
      "name": "Michael",
      "avatar_url": "https://avatars.githubusercontent.com/u/2052646?v=4",
      "profile": "http://cancompute.tech",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "pksadiq",
      "name": "Mohammed Sadiq",
      "avatar_url": "https://avatars.githubusercontent.com/u/1289514?v=4",
      "profile": "https://www.sadiqpk.org",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "Jak-Ch-ll",
      "name": "Jakob",
      "avatar_url": "https://avatars.githubusercontent.com/u/56225668?v=4",
      "profile": "https://github.com/Jak-Ch-ll",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "ob",
      "name": "Oscar Bonilla",
      "avatar_url": "https://avatars.githubusercontent.com/u/4950?v=4",
      "profile": "http://oscarbonilla.com",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "husjon",
      "name": "Jon Erling Hustadnes",
      "avatar_url": "https://avatars.githubusercontent.com/u/554229?v=4",
      "profile": "https://github.com/husjon",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "CobaltCause",
      "name": "Charles Hall",
      "avatar_url": "https://avatars.githubusercontent.com/u/7003738?v=4",
      "profile": "https://github.com/CobaltCause",
      "contributions": [
        "infra"
      ]
    },
    {
      "login": "krmpotic",
      "name": "Luka Krmpotić",
      "avatar_url": "https://avatars.githubusercontent.com/u/10350645?v=4",
      "profile": "https://github.com/krmpotic",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "jurglic",
      "name": "Jurglic",
      "avatar_url": "https://avatars.githubusercontent.com/u/112600?v=4",
      "profile": "https://github.com/jurglic",
      "contributions": [
        "content"
      ]
    },
    {
      "login": "OfirLauber",
      "name": "Ofir Lauber",
      "avatar_url": "https://avatars.githubusercontent.com/u/5631030?v=4",
      "profile": "https://github.com/OfirLauber",
      "contributions": [
        "content"
      ]
    }
  ],
  "contributorsPerLine": 8,
@ -2441,6 +2117,5 @@
  "repoType": "github",
  "repoHost": "https://github.com",
  "skipCi": true,
-  "commitConvention": "angular",
+  "commitConvention": "angular"
  "commitType": "docs"
 }
--- a/.envrc
+++ b/.envrc
@ -1,4 +0,0 @@
 #!/usr/bin/env bash
 # Automatically Load nix devShell w/dotenv
 use flake
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@ -0,0 +1,18 @@
 name: Lint
 on:
  push:
    branches:
      - main
  pull_request:
    branches:
      - main
 jobs:
  lint:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
      - uses: DavidAnson/markdownlint-cli2-action@v9
        with:
          globs: "exercises/**/*.md"
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@ -10,28 +10,11 @@ env:
  CARGO_TERM_COLOR: always
 jobs:
-  fmt:
+  build:
    runs-on: ubuntu-latest
    steps:
    - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@stable
+    - name: Build
-        with:
+      run: cargo build --verbose
-          components: rustfmt
+    - name: Run tests
-      - uses: DavidAnson/markdownlint-cli2-action@v9
+      run: cargo test --verbose
        with:
          globs: "exercises/**/*.md"
      - name: Run cargo fmt
        run: |
          cargo fmt --all -- --check
  test:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
        os: [ubuntu-latest, windows-latest, macOS-latest]
    steps:
      - uses: actions/checkout@v3
      - uses: dtolnay/rust-toolchain@stable
      - uses: swatinem/rust-cache@v2
      - name: Run cargo test
        run: |
          cargo test
--- a/.github/workflows/web.yml
+++ b/.github/workflows/web.yml
@ -1,88 +0,0 @@
 # Workflow to build your docs with oranda (and mdbook)
 # and deploy them to Github Pages
 name: Web
 # We're going to push to the gh-pages branch, so we need that permission
 permissions:
  contents: write
 # What situations do we want to build docs in?
 # All of these work independently and can be removed / commented out
 # if you don't want oranda/mdbook running in that situation
 on:
  # Check that a PR didn't break docs!
  #
  # Note that the "Deploy to Github Pages" step won't run in this mode,
  # so this won't have any side-effects. But it will tell you if a PR
  # completely broke oranda/mdbook. Sadly we don't provide previews (yet)!
  pull_request:
  # Whenever something gets pushed to main, update the docs!
  # This is great for getting docs changes live without cutting a full release.
  #
  # Note that if you're using cargo-dist, this will "race" the Release workflow
  # that actually builds the Github Release that oranda tries to read (and
  # this will almost certainly complete first). As a result you will publish
  # docs for the latest commit but the oranda landing page won't know about
  # the latest release. The workflow_run trigger below will properly wait for
  # cargo-dist, and so this half-published state will only last for ~10 minutes.
  #
  # If you only want docs to update with releases, disable this, or change it to
  # a "release" branch. You can, of course, also manually trigger a workflow run
  # when you want the docs to update.
  push:
    branches:
      - main
  # Whenever a workflow called "Release" completes, update the docs!
  #
  # If you're using cargo-dist, this is recommended, as it will ensure that
  # oranda always sees the latest release right when it's available. Note
  # however that Github's UI is wonky when you use workflow_run, and won't
  # show this workflow as part of any commit. You have to go to the "actions"
  # tab for your repo to see this one running (the gh-pages deploy will also
  # only show up there).
  workflow_run:
    workflows: [ "Release" ]
    types:
      - completed
 # Alright, let's do it!
 jobs:
  web:
    name: Build and deploy site and docs
    runs-on: ubuntu-latest
    steps:
      # Setup
      - uses: actions/checkout@v3
        with:
          fetch-depth: 0
      - uses: dtolnay/rust-toolchain@stable
      - uses: swatinem/rust-cache@v2
      # If you use any mdbook plugins, here's the place to install them!
      # Install and run oranda (and mdbook)
      # This will write all output to ./public/ (including copying mdbook's output to there)
      - name: Install and run oranda
        run: |
          curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/oranda/releases/download/v0.3.1/oranda-installer.sh | sh
          oranda build
      # Deploy to our gh-pages branch (creating it if it doesn't exist)
      # the "public" dir that oranda made above will become the root dir
      # of this branch.
      #
      # Note that once the gh-pages branch exists, you must
      # go into repo's settings > pages and set "deploy from branch: gh-pages"
      # the other defaults work fine.
      - name: Deploy to Github Pages
        uses: JamesIves/github-pages-deploy-action@v4.4.1
        # ONLY if we're on main (so no PRs or feature branches allowed!)
        if: ${{ github.ref == 'refs/heads/main' }}
        with:
          branch: gh-pages
          # Gotta tell the action where to find oranda's output
          folder: public
          token: ${{ secrets.GITHUB_TOKEN }}
          single-commit: true
--- a/.gitignore
+++ b/.gitignore
@ -11,8 +11,3 @@ rust-project.json
 !.vscode/extensions.json
 *.iml
 *.o
 public/
 .direnv/
 # Local Netlify folder
 .netlify
--- a/AUTHORS.md
+++ b/AUTHORS.md
@ -298,52 +298,6 @@ authors.
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/rb5014"><img src="https://avatars.githubusercontent.com/u/105397317?v=4?s=100" width="100px;" alt="rb5014"/><br /><sub><b>rb5014</b></sub></a><br /><a href="#content-rb5014" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/deedy5"><img src="https://avatars.githubusercontent.com/u/65482418?v=4?s=100" width="100px;" alt="deedy5"/><br /><sub><b>deedy5</b></sub></a><br /><a href="#content-deedy5" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/lionel-rowe"><img src="https://avatars.githubusercontent.com/u/26078826?v=4?s=100" width="100px;" alt="lionel-rowe"/><br /><sub><b>lionel-rowe</b></sub></a><br /><a href="#content-lionel-rowe" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/Ben2917"><img src="https://avatars.githubusercontent.com/u/10279994?v=4?s=100" width="100px;" alt="Ben"/><br /><sub><b>Ben</b></sub></a><br /><a href="#content-Ben2917" title="Content">🖋</a></td>
    </tr>
    <tr>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/b1ue64"><img src="https://avatars.githubusercontent.com/u/77976308?v=4?s=100" width="100px;" alt="b1ue64"/><br /><sub><b>b1ue64</b></sub></a><br /><a href="#content-b1ue64" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/lazywalker"><img src="https://avatars.githubusercontent.com/u/53956?v=4?s=100" width="100px;" alt="lazywalker"/><br /><sub><b>lazywalker</b></sub></a><br /><a href="#content-lazywalker" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/proofconstruction"><img src="https://avatars.githubusercontent.com/u/74747193?v=4?s=100" width="100px;" alt="proofconstruction"/><br /><sub><b>proofconstruction</b></sub></a><br /><a href="#infra-proofconstruction" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://www.youtube.com/channel/UCQCjA6qUutAtWqkCA4Z36CQ"><img src="https://avatars.githubusercontent.com/u/16007179?v=4?s=100" width="100px;" alt="IVIURRAY"/><br /><sub><b>IVIURRAY</b></sub></a><br /><a href="#content-IVIURRAY" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/b-apperlo"><img src="https://avatars.githubusercontent.com/u/91734527?v=4?s=100" width="100px;" alt="Bert Apperlo"/><br /><sub><b>Bert Apperlo</b></sub></a><br /><a href="#content-b-apperlo" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://fwdekker.com/"><img src="https://avatars.githubusercontent.com/u/13442533?v=4?s=100" width="100px;" alt="Florine W. Dekker"/><br /><sub><b>Florine W. Dekker</b></sub></a><br /><a href="#content-FWDekker" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/luhem7"><img src="https://avatars.githubusercontent.com/u/4008215?v=4?s=100" width="100px;" alt="Mehul Gangavelli"/><br /><sub><b>Mehul Gangavelli</b></sub></a><br /><a href="#content-luhem7" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/Frosthage"><img src="https://avatars.githubusercontent.com/u/14823314?v=4?s=100" width="100px;" alt="Mikael Frosthage"/><br /><sub><b>Mikael Frosthage</b></sub></a><br /><a href="#content-Frosthage" title="Content">🖋</a></td>
    </tr>
    <tr>
      <td align="center" valign="top" width="12.5%"><a href="https://robertfry.xyz"><img src="https://avatars.githubusercontent.com/u/43712054?v=4?s=100" width="100px;" alt="Robert Fry"/><br /><sub><b>Robert Fry</b></sub></a><br /><a href="#content-robertefry" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/tajo48"><img src="https://avatars.githubusercontent.com/u/55502906?v=4?s=100" width="100px;" alt="tajo48"/><br /><sub><b>tajo48</b></sub></a><br /><a href="#content-tajo48" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://anishchhetri.com.np"><img src="https://avatars.githubusercontent.com/u/98446102?v=4?s=100" width="100px;" alt="Anish"/><br /><sub><b>Anish</b></sub></a><br /><a href="#content-novanish" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/vnprc"><img src="https://avatars.githubusercontent.com/u/9425366?v=4?s=100" width="100px;" alt="vnprc"/><br /><sub><b>vnprc</b></sub></a><br /><a href="#content-vnprc" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="http://androecia.net"><img src="https://avatars.githubusercontent.com/u/61999256?v=4?s=100" width="100px;" alt="Joshua Carlson"/><br /><sub><b>Joshua Carlson</b></sub></a><br /><a href="#content-jrcarl624" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://johndesilencio.me"><img src="https://avatars.githubusercontent.com/u/20136554?v=4?s=100" width="100px;" alt="Nicholas R. Smith"/><br /><sub><b>Nicholas R. Smith</b></sub></a><br /><a href="https://github.com/rust-lang/rustlings/commits?author=johnDeSilencio" title="Code">💻</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://alexfertel.me"><img src="https://avatars.githubusercontent.com/u/22298999?v=4?s=100" width="100px;" alt="Alexander González"/><br /><sub><b>Alexander González</b></sub></a><br /><a href="#content-alexfertel" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/softarn"><img src="https://avatars.githubusercontent.com/u/517619?v=4?s=100" width="100px;" alt="Marcus Höjvall"/><br /><sub><b>Marcus Höjvall</b></sub></a><br /><a href="#content-softarn" title="Content">🖋</a></td>
    </tr>
    <tr>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/barlevalon"><img src="https://avatars.githubusercontent.com/u/3397911?v=4?s=100" width="100px;" alt="Alon Hearter"/><br /><sub><b>Alon Hearter</b></sub></a><br /><a href="#content-barlevalon" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/shirts"><img src="https://avatars.githubusercontent.com/u/4952151?v=4?s=100" width="100px;" alt="shirts"/><br /><sub><b>shirts</b></sub></a><br /><a href="#content-shirts" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/eLVas"><img src="https://avatars.githubusercontent.com/u/6797156?v=4?s=100" width="100px;" alt="Ivan Vasiunyk"/><br /><sub><b>Ivan Vasiunyk</b></sub></a><br /><a href="#content-eLVas" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://mo8it.com"><img src="https://avatars.githubusercontent.com/u/76752051?v=4?s=100" width="100px;" alt="Mo"/><br /><sub><b>Mo</b></sub></a><br /><a href="https://github.com/rust-lang/rustlings/commits?author=mo8it" title="Code">💻</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/x10an14"><img src="https://avatars.githubusercontent.com/u/710608?v=4?s=100" width="100px;" alt="x10an14"/><br /><sub><b>x10an14</b></sub></a><br /><a href="#infra-x10an14" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/gabay"><img src="https://avatars.githubusercontent.com/u/5773610?v=4?s=100" width="100px;" alt="Roi Gabay"/><br /><sub><b>Roi Gabay</b></sub></a><br /><a href="#content-gabay" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/mkovaxx"><img src="https://avatars.githubusercontent.com/u/481354?v=4?s=100" width="100px;" alt="Máté Kovács"/><br /><sub><b>Máté Kovács</b></sub></a><br /><a href="#content-mkovaxx" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://szabgab.com/"><img src="https://avatars.githubusercontent.com/u/48833?v=4?s=100" width="100px;" alt="Gábor Szabó"/><br /><sub><b>Gábor Szabó</b></sub></a><br /><a href="#content-szabgab" title="Content">🖋</a></td>
    </tr>
    <tr>
      <td align="center" valign="top" width="12.5%"><a href="https://moduslaborandi.net"><img src="https://avatars.githubusercontent.com/u/3340793?v=4?s=100" width="100px;" alt="Yamila Moreno"/><br /><sub><b>Yamila Moreno</b></sub></a><br /><a href="#content-yamila-moreno" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/willhack"><img src="https://avatars.githubusercontent.com/u/18036720?v=4?s=100" width="100px;" alt="Will Hack"/><br /><sub><b>Will Hack</b></sub></a><br /><a href="#content-willhack" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="http://cancompute.tech"><img src="https://avatars.githubusercontent.com/u/2052646?v=4?s=100" width="100px;" alt="Michael"/><br /><sub><b>Michael</b></sub></a><br /><a href="#content-bean5" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://www.sadiqpk.org"><img src="https://avatars.githubusercontent.com/u/1289514?v=4?s=100" width="100px;" alt="Mohammed Sadiq"/><br /><sub><b>Mohammed Sadiq</b></sub></a><br /><a href="#content-pksadiq" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/Jak-Ch-ll"><img src="https://avatars.githubusercontent.com/u/56225668?v=4?s=100" width="100px;" alt="Jakob"/><br /><sub><b>Jakob</b></sub></a><br /><a href="#content-Jak-Ch-ll" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="http://oscarbonilla.com"><img src="https://avatars.githubusercontent.com/u/4950?v=4?s=100" width="100px;" alt="Oscar Bonilla"/><br /><sub><b>Oscar Bonilla</b></sub></a><br /><a href="#content-ob" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/husjon"><img src="https://avatars.githubusercontent.com/u/554229?v=4?s=100" width="100px;" alt="Jon Erling Hustadnes"/><br /><sub><b>Jon Erling Hustadnes</b></sub></a><br /><a href="#content-husjon" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/CobaltCause"><img src="https://avatars.githubusercontent.com/u/7003738?v=4?s=100" width="100px;" alt="Charles Hall"/><br /><sub><b>Charles Hall</b></sub></a><br /><a href="#infra-CobaltCause" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
    </tr>
    <tr>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/krmpotic"><img src="https://avatars.githubusercontent.com/u/10350645?v=4?s=100" width="100px;" alt="Luka Krmpotić"/><br /><sub><b>Luka Krmpotić</b></sub></a><br /><a href="#content-krmpotic" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/jurglic"><img src="https://avatars.githubusercontent.com/u/112600?v=4?s=100" width="100px;" alt="Jurglic"/><br /><sub><b>Jurglic</b></sub></a><br /><a href="#content-jurglic" title="Content">🖋</a></td>
      <td align="center" valign="top" width="12.5%"><a href="https://github.com/OfirLauber"><img src="https://avatars.githubusercontent.com/u/5631030?v=4?s=100" width="100px;" alt="Ofir Lauber"/><br /><sub><b>Ofir Lauber</b></sub></a><br /><a href="#content-OfirLauber" title="Content">🖋</a></td>
    </tr>
  </tbody>
 </table>
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,101 +1,3 @@
 <a name="5.6.1"></a>
 ## 5.6.1 (2023-09-18)
 #### Changed
 - Converted all exercises with assertions to test mode.
 #### Fixed
 - `cow1`: Reverted regression introduced by calling `to_mut` where it
  shouldn't have been called, and clarified comment.
 - `primitive_types3`: Require at least an array of 100 elements.
 - Removed hint comments when no hint exists for the exercise.
 - `as_ref_mut`: Fixed a typo in a test function name.
 - `enums3`: Fixed formatting with `rustfmt`.
 <a name="5.6.0"></a>
 ## 5.6.0 (2023-09-04)
 #### Added
 - New exercise: `if3`, teaching the user about `if let` statements.
 - `hashmaps2`: Added an extra test function to check if the amount of fruits is higher than zero.
 - `enums3`: Added a test for `Message`.
 - `if1`: Added a test case to check equal values.
 - `if3`: Added a note specifying that there are no test changes needed.
 #### Changed
 - Swapped the order of threads and smart pointer exercises.
 - Rewrote the CLI to use `clap` - it's matured much since we switched to `argh` :)
 - `structs3`: Switched from i32 to u32.
 - `move_semantics`: Switched 1-4 to tests, and rewrote them to be way simpler, while still teaching about the same 
  concepts.
 #### Fixed
 - `iterators5`:
  - Removed an outdated part of the hint.
  - Renamed variables to use snake_case.
 - `vecs2`: Updated the hint to reference the renamed loop variable.
 - `enums3`: Changed message string in test so that it gets properly tested.
 - `strings2`: Corrected line number in hint, then removed it (this both happened as part of this release cycle).
 - `primitive_types4`: Updated hint to the correct ending index.
 - `quiz1`: Removed duplicated sentence from exercise comments.
 - `errors4`: Improved comment.
 - `from_into`: Fixed test values.
 - `cow1`: Added `.to_mut()` to distinguish from the previous test case.
 - `threads2`: Updated hint text to reference the correct book heading.
 #### Housekeeping
 - Cleaned up the explanation paragraphs at the start of each exercise.
 - Lots of Nix housekeeping that I don't feel qualified to write about!
 - Improved CI workflows, we're now testing on multiple platforms at once.
 <a name="5.5.1"></a>
 ## 5.5.1 (2023-05-17)
 #### Fixed
 - Reverted `rust-project.json` path generation due to an upstream `rust-analyzer` fix.
 <a name="5.5.0"></a>
 ## 5.5.0 (2023-05-17)
 #### Added
 - `strings2`: Added a reference to the book chapter for reference conversion
 - `lifetimes`: Added a link to the lifetimekata project
 - Added a new `tests4` exercises, which teaches about testing for panics
 - Added a `!` prefix command to watch mode that runs an external command
 - Added a `--success-hints` option to watch mode that shows hints on exercise success
 #### Changed
 - `vecs2`: Renamed iterator variable bindings for clarify
 - `lifetimes`: Changed order of book references
 - `hashmaps2`: Clarified instructions in the todo block
 - Moved lifetime exercises before test exercises (via the recommended book ordering)
 - `options2`: Improved tests for layering options
 - `modules2`: Added more information to the hint
 #### Fixed
 - `errors2`: Corrected a comment wording
 - `iterators2`: Fixed a spelling mistake in the hint text
 - `variables`: Wrapped the mut keyword with backticks for readability
 - `move_semantics2`: Removed references to line numbers
 - `cow1`: Clarified the `owned_no_mutation` comments
 - `options3`: Changed exercise to panic when no match is found
 - `rustlings lsp` now generates absolute paths, which should fix VSCode `rust-analyzer` usage on Windows
 #### Housekeeping
 - Added a markdown linter to run on GitHub actions
 - Split quick installation section into two code blocks
 <a name="5.4.1"></a>
 ## 5.4.1 (2023-03-10)
--- a/Cargo.lock
+++ b/Cargo.lock
@ -12,66 +12,43 @@ dependencies = [
 ]
 [[package]]
-name = "anstream"
+name = "argh"
-version = "0.5.0"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
+checksum = "ab257697eb9496bf75526f0217b5ed64636a9cfafa78b8365c71bd283fcef93e"
 dependencies = [
- "anstyle",
+ "argh_derive",
- "anstyle-parse",
+ "argh_shared",
 "anstyle-query",
 "anstyle-wincon",
 "colorchoice",
 "utf8parse",
 ]
 [[package]]
-name = "anstyle"
+name = "argh_derive"
-version = "1.0.3"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46"
+checksum = "b382dbd3288e053331f03399e1db106c9fb0d8562ad62cb04859ae926f324fa6"
 [[package]]
 name = "anstyle-parse"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
 dependencies = [
- "utf8parse",
+ "argh_shared",
 "proc-macro2",
 "quote",
 "syn 1.0.109",
 ]
 [[package]]
-name = "anstyle-query"
+name = "argh_shared"
-version = "1.0.0"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+checksum = "64cb94155d965e3d37ffbbe7cc5b82c3dd79dd33bd48e536f73d2cfb8d85506f"
 dependencies = [
 "windows-sys 0.48.0",
 ]
 [[package]]
 name = "anstyle-wincon"
 version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
 dependencies = [
 "anstyle",
 "windows-sys 0.48.0",
 ]
 [[package]]
 name = "assert_cmd"
-version = "2.0.12"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6"
+checksum = "2dc477793bd82ec39799b6f6b3df64938532fdf2ab0d49ef817eac65856a5a1e"
 dependencies = [
- "anstyle",
+ "escargot",
 "bstr",
 "doc-comment",
 "predicates",
 "predicates-core",
 "predicates-tree",
 "wait-timeout",
 ]
 [[package]]
@ -86,17 +63,6 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 [[package]]
 name = "bstr"
 version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a"
 dependencies = [
 "memchr",
 "regex-automata",
 "serde",
 ]
 [[package]]
 name = "cfg-if"
 version = "0.1.10"
@ -109,52 +75,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 [[package]]
 name = "clap"
 version = "4.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6"
 dependencies = [
 "clap_builder",
 "clap_derive",
 ]
 [[package]]
 name = "clap_builder"
 version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08"
 dependencies = [
 "anstream",
 "anstyle",
 "clap_lex",
 "strsim",
 ]
 [[package]]
 name = "clap_derive"
 version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
 dependencies = [
 "heck",
 "proc-macro2",
 "quote",
 "syn",
 ]
 [[package]]
 name = "clap_lex"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
 [[package]]
 name = "colorchoice"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 [[package]]
 name = "console"
 version = "0.15.5"
@ -169,22 +89,10 @@ dependencies = [
 ]
 [[package]]
-name = "difflib"
+name = "difference"
-version = "0.4.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
+checksum = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
 [[package]]
 name = "doc-comment"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
 [[package]]
 name = "either"
 version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 [[package]]
 name = "encode_unicode"
@ -193,10 +101,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 [[package]]
-name = "equivalent"
+name = "escargot"
-version = "1.0.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "ceb9adbf9874d5d028b5e4c5739d22b71988252b25c9c98fe7cf9738bee84597"
 dependencies = [
 "lazy_static",
 "log",
 "serde",
 "serde_json",
 ]
 [[package]]
 name = "filetime"
@ -212,9 +126,9 @@ dependencies = [
 [[package]]
 name = "float-cmp"
-version = "0.9.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
+checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4"
 dependencies = [
 "num-traits",
 ]
@ -260,18 +174,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 [[package]]
 name = "hashbrown"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
 [[package]]
 name = "heck"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 [[package]]
 name = "home"
 version = "0.5.4"
@ -281,27 +183,16 @@ dependencies = [
 "winapi 0.3.9",
 ]
 [[package]]
 name = "indexmap"
 version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
 dependencies = [
 "equivalent",
 "hashbrown",
 ]
 [[package]]
 name = "indicatif"
-version = "0.17.6"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730"
+checksum = "2d207dc617c7a380ab07ff572a6e52fa202a2a8f355860ac9c38e23f8196be1b"
 dependencies = [
 "console",
- "instant",
+ "lazy_static",
 "number_prefix",
- "portable-atomic",
+ "regex",
 "unicode-width",
 ]
 [[package]]
@ -324,15 +215,6 @@ dependencies = [
 "libc",
 ]
 [[package]]
 name = "instant"
 version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
 "cfg-if 1.0.0",
 ]
 [[package]]
 name = "iovec"
 version = "0.1.4"
@ -342,15 +224,6 @@ dependencies = [
 "libc",
 ]
 [[package]]
 name = "itertools"
 version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
 dependencies = [
 "either",
 ]
 [[package]]
 name = "itoa"
 version = "1.0.6"
@ -396,9 +269,9 @@ dependencies = [
 [[package]]
 name = "memchr"
-version = "2.6.3"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 [[package]]
 name = "mio"
@ -493,22 +366,14 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 [[package]]
 name = "portable-atomic"
 version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b"
 [[package]]
 name = "predicates"
-version = "3.0.3"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9"
+checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df"
 dependencies = [
- "anstyle",
+ "difference",
 "difflib",
 "float-cmp",
 "itertools",
 "normalize-line-endings",
 "predicates-core",
 "regex",
@ -568,12 +433,6 @@ dependencies = [
 "regex-syntax",
 ]
 [[package]]
 name = "regex-automata"
 version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
 [[package]]
 name = "regex-syntax"
 version = "0.6.29"
@ -582,10 +441,10 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 [[package]]
 name = "rustlings"
-version = "5.6.1"
+version = "5.4.1"
 dependencies = [
 "argh",
 "assert_cmd",
 "clap",
 "console",
 "glob",
 "home",
@ -630,7 +489,7 @@ checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn",
+ "syn 2.0.8",
 ]
 [[package]]
@ -644,15 +503,6 @@ dependencies = [
 "serde",
 ]
 [[package]]
 name = "serde_spanned"
 version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
 dependencies = [
 "serde",
 ]
 [[package]]
 name = "slab"
 version = "0.4.8"
@ -663,10 +513,15 @@ dependencies = [
 ]
 [[package]]
-name = "strsim"
+name = "syn"
-version = "0.10.0"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
 "proc-macro2",
 "quote",
 "unicode-ident",
 ]
 [[package]]
 name = "syn"
@ -687,36 +542,11 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 [[package]]
 name = "toml"
-version = "0.7.8"
+version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
 dependencies = [
 "serde",
 "serde_spanned",
 "toml_datetime",
 "toml_edit",
 ]
 [[package]]
 name = "toml_datetime"
 version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
 dependencies = [
 "serde",
 ]
 [[package]]
 name = "toml_edit"
 version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
 "indexmap",
 "serde",
 "serde_spanned",
 "toml_datetime",
 "winnow",
 ]
 [[package]]
@ -731,21 +561,6 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
 [[package]]
 name = "utf8parse"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 [[package]]
 name = "wait-timeout"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
 dependencies = [
 "libc",
 ]
 [[package]]
 name = "walkdir"
 version = "2.3.3"
@ -805,13 +620,13 @@ version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.2",
+ "windows_aarch64_msvc",
- "windows_i686_gnu 0.42.2",
+ "windows_i686_gnu",
- "windows_i686_msvc 0.42.2",
+ "windows_i686_msvc",
- "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnu",
- "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.2",
+ "windows_x86_64_msvc",
 ]
 [[package]]
@ -820,16 +635,7 @@ version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
 dependencies = [
- "windows-targets 0.42.2",
+ "windows-targets",
 ]
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
 "windows-targets 0.48.5",
 ]
 [[package]]
@ -838,28 +644,13 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.2",
+ "windows_aarch64_msvc",
- "windows_i686_gnu 0.42.2",
+ "windows_i686_gnu",
- "windows_i686_msvc 0.42.2",
+ "windows_i686_msvc",
- "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnu",
- "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.2",
+ "windows_x86_64_msvc",
 ]
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
 "windows_aarch64_gnullvm 0.48.5",
 "windows_aarch64_msvc 0.48.5",
 "windows_i686_gnu 0.48.5",
 "windows_i686_msvc 0.48.5",
 "windows_x86_64_gnu 0.48.5",
 "windows_x86_64_gnullvm 0.48.5",
 "windows_x86_64_msvc 0.48.5",
 ]
 [[package]]
@ -868,93 +659,42 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 [[package]]
 name = "winnow"
 version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
 dependencies = [
 "memchr",
 ]
 [[package]]
 name = "ws2_32-sys"
 version = "0.2.1"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,7 +1,6 @@
 [package]
 name = "rustlings"
-description = "Small exercises to get you used to reading and writing Rust code!"
+version = "5.4.1"
 version = "5.6.1"
 authors = [
  "Liv <mokou@fastmail.com>",
  "Carol (Nichols || Goulding) <carol.nichols@gmail.com>",
@ -9,22 +8,22 @@ authors = [
 edition = "2021"
 [dependencies]
-indicatif = "0.17.6"
+argh = "0.1"
 indicatif = "0.16"
 console = "0.15"
 notify = "4.0"
-toml = "0.7.6"
+toml = "0.5"
 regex = "1.5"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.81"
 home = "0.5.3"
 glob = "0.3.0"
 clap = { version = "4.4.0", features = ["derive"] }
 [[bin]]
 name = "rustlings"
 path = "src/main.rs"
 [dev-dependencies]
-assert_cmd = "2.0.12"
+assert_cmd = "0.11.0"
-predicates = "3.0.3"
+predicates = "1.0.1"
 glob = "0.3.0"
--- a/README.md
+++ b/README.md
@ -1,9 +1,5 @@
 <div class="oranda-hide">
 # rustlings 🦀❤️
 </div>
 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!
 _...looking for the old, web-based version of Rustlings? Try [here](https://github.com/rust-lang/rustlings/tree/rustlings-1)_
@ -18,7 +14,7 @@ Alternatively, for a first-time Rust learner, there are 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're on Linux, make sure you've installed gcc. Deb: `sudo apt install gcc`. Yum: `sudo yum -y install gcc`._
-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.
+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
@ -27,7 +23,6 @@ Just run:
 ```bash
 curl -L https://raw.githubusercontent.com/rust-lang/rustlings/main/install.sh | bash
 ```
 Or if you want it to be installed to a different path:
 ```bash
@ -41,8 +36,8 @@ This will install Rustlings and give you access to the `rustlings` command. Run
 Basically: Clone the repository at the latest tag, finally run `nix develop` or `nix-shell`.
 ```bash
-# find out the latest version at https://github.com/rust-lang/rustlings/releases/latest (on edit 5.6.1)
+# find out the latest version at https://github.com/rust-lang/rustlings/releases/latest (on edit 5.4.1)
-git clone -b 5.6.1 --depth 1 https://github.com/rust-lang/rustlings
+git clone -b 5.4.1 --depth 1 https://github.com/rust-lang/rustlings
 cd rustlings
 # if nix version > 2.3
 nix develop
@ -79,8 +74,8 @@ If you get a permission denied message, you might have to exclude the directory
 Basically: Clone the repository at the latest tag, run `cargo install --path .`.
 ```bash
-# find out the latest version at https://github.com/rust-lang/rustlings/releases/latest (on edit 5.6.1)
+# find out the latest version at https://github.com/rust-lang/rustlings/releases/latest (on edit 5.4.1)
-git clone -b 5.6.1 --depth 1 https://github.com/rust-lang/rustlings
+git clone -b 5.4.1 --depth 1 https://github.com/rust-lang/rustlings
 cd rustlings
 cargo install --force --path .
 ```
@ -173,8 +168,12 @@ Now you should be done!
 ## Contributing
-See [CONTRIBUTING.md](https://github.com/rust-lang/rustlings/blob/main/CONTRIBUTING.md).
+See [CONTRIBUTING.md](./CONTRIBUTING.md).
 Development-focused discussion about Rustlings happens in the [**rustlings** stream](https://rust-lang.zulipchat.com/#narrow/stream/334454-rustlings)
 on the [Rust Project Zulip](https://rust-lang.zulipchat.com). Feel free to start a new thread there
 if you have ideas or suggestions!
 ## Contributors ✨
-Thanks goes to the wonderful people listed in [AUTHORS.md](https://github.com/rust-lang/rustlings/blob/main/AUTHORS.md) 🎉
+Thanks goes to the wonderful people listed in [AUTHORS.md](./AUTHORS.md) 🎉
--- a/exercises/clippy/clippy1.rs
+++ b/exercises/clippy/clippy1.rs
@ -1,13 +1,10 @@
 // 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.
 //
-// The Clippy tool is a collection of lints to analyze your code so you can
+// For these exercises the code will fail to compile when there are clippy warnings
-// catch common mistakes and improve your Rust code.
+// check clippy's suggestions from the output to solve the exercise.
-//
+// Execute `rustlings hint clippy1` or use the `hint` watch subcommand for a hint.
 // 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` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/clippy/clippy2.rs
+++ b/exercises/clippy/clippy2.rs
@ -1,7 +1,5 @@
 // clippy2.rs
-// 
+// Execute `rustlings hint clippy2` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint clippy2` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/clippy/clippy3.rs
+++ b/exercises/clippy/clippy3.rs
@ -1,7 +1,5 @@
 // clippy3.rs
 // 
 // Here's a couple more easy Clippy fixes, so you can see its utility.
 // No hints.
 // I AM NOT DONE
--- a/exercises/conversions/as_ref_mut.rs
+++ b/exercises/conversions/as_ref_mut.rs
@ -1,11 +1,7 @@
-// as_ref_mut.rs
+// AsRef and AsMut allow for cheap reference-to-reference conversions.
-//
+// Read more about them at https://doc.rust-lang.org/std/convert/trait.AsRef.html
-// AsRef and AsMut allow for cheap reference-to-reference conversions. Read more
+// and https://doc.rust-lang.org/std/convert/trait.AsMut.html, respectively.
-// about them at https://doc.rust-lang.org/std/convert/trait.AsRef.html and
+// Execute `rustlings hint as_ref_mut` or use the `hint` watch subcommand for a hint.
 // https://doc.rust-lang.org/std/convert/trait.AsMut.html, respectively.
 //
 // Execute `rustlings hint as_ref_mut` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
@ -57,7 +53,7 @@ mod tests {
    }
    #[test]
-    fn mut_box() {
+    fn mult_box() {
        let mut num: Box<u32> = Box::new(3);
        num_sq(&mut num);
        assert_eq!(*num, 9);
--- a/exercises/conversions/from_into.rs
+++ b/exercises/conversions/from_into.rs
@ -1,11 +1,7 @@
-// from_into.rs
+// The From trait is used for value-to-value conversions.
-//
+// If From is implemented correctly for a type, the Into trait should work conversely.
-// The From trait is used for value-to-value conversions. If From is implemented
+// You can read more about it at https://doc.rust-lang.org/std/convert/trait.From.html
-// correctly for a type, the Into trait should work conversely. You can read
+// Execute `rustlings hint from_into` or use the `hint` watch subcommand for a hint.
 // more about it at https://doc.rust-lang.org/std/convert/trait.From.html
 //
 // Execute `rustlings hint from_into` or use the `hint` watch subcommand for a
 // hint.
 #[derive(Debug)]
 struct Person {
@ -24,21 +20,20 @@ impl Default for Person {
    }
 }
-// Your task is to complete this implementation in order for the line `let p =
+// Your task is to complete this implementation
-// Person::from("Mark,20")` to compile Please note that you'll need to parse the
+// in order for the line `let p = Person::from("Mark,20")` to compile
-// age component into a `usize` with something like `"4".parse::<usize>()`. The
+// Please note that you'll need to parse the age component into a `usize`
-// outcome of this needs to be handled appropriately.
+// with something like `"4".parse::<usize>()`. The outcome of this needs to
 // be handled appropriately.
 //
 // Steps:
-// 1. If the length of the provided string is 0, then return the default of
+// 1. If the length of the provided string is 0, then return the default of Person
-//    Person.
+// 2. Split the given string on the commas present in it
-// 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
-// 3. Extract the first element from the split operation and use it as the name.
+// 4. If the name is empty, then return the default of Person
-// 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
-// 5. Extract the other element from the split operation and parse it into a
+// If while parsing the age, something goes wrong, then return the default of Person
-//    `usize` as the age.
+// Otherwise, then return an instantiated Person object with the results
 // If while parsing the age, something goes wrong, then return the default of
 // Person Otherwise, then return an instantiated Person object with the results
 // I AM NOT DONE
@ -82,8 +77,7 @@ mod tests {
    }
    #[test]
    fn test_bad_age() {
-        // Test that "Mark,twenty" will return the default person due to an
+        // Test that "Mark,twenty" will return the default person due to an error in parsing age
        // error in parsing age
        let p = Person::from("Mark,twenty");
        assert_eq!(p.name, "John");
        assert_eq!(p.age, 30);
@ -127,14 +121,14 @@ mod tests {
    #[test]
    fn test_trailing_comma() {
        let p: Person = Person::from("Mike,32,");
-        assert_eq!(p.name, "Mike");
+        assert_eq!(p.name, "John");
-        assert_eq!(p.age, 32);
+        assert_eq!(p.age, 30);
    }
    #[test]
    fn test_trailing_comma_and_some_string() {
        let p: Person = Person::from("Mike,32,man");
-        assert_eq!(p.name, "Mike");
+        assert_eq!(p.name, "John");
-        assert_eq!(p.age, 32);
+        assert_eq!(p.age, 30);
    }
 }
--- a/exercises/conversions/from_str.rs
+++ b/exercises/conversions/from_str.rs
@ -1,13 +1,10 @@
 // from_str.rs
-//
+// This is similar to from_into.rs, but this time we'll implement `FromStr`
-// This is similar to from_into.rs, but this time we'll implement `FromStr` and
+// and return errors instead of falling back to a default value.
-// return errors instead of falling back to a default value. Additionally, upon
+// Additionally, upon implementing FromStr, you can use the `parse` method
-// implementing FromStr, you can use the `parse` method on strings to generate
+// on strings to generate an object of the implementor type.
-// an object of the implementor type. You can read more about it at
+// You can read more about it at https://doc.rust-lang.org/std/str/trait.FromStr.html
-// https://doc.rust-lang.org/std/str/trait.FromStr.html
+// Execute `rustlings hint from_str` or use the `hint` watch subcommand for a hint.
 //
 // Execute `rustlings hint from_str` or use the `hint` watch subcommand for a
 // hint.
 use std::num::ParseIntError;
 use std::str::FromStr;
@ -36,18 +33,15 @@ enum ParsePersonError {
 // Steps:
 // 1. If the length of the provided string is 0, an error should be returned
 // 2. Split the given string on the commas present in it
-// 3. Only 2 elements should be returned from the split, otherwise return an
+// 3. Only 2 elements should be returned from the split, otherwise return an error
 //    error
 // 4. Extract the first element from the split operation and use it as the name
-// 5. Extract the other element from the split operation and parse it into a
+// 5. Extract the other element from the split operation and parse it into a `usize` as the age
-//    `usize` as the age with something like `"4".parse::<usize>()`
+//    with something like `"4".parse::<usize>()`
-// 6. If while extracting the name and the age something goes wrong, an error
+// 6. If while extracting the name and the age something goes wrong, an error should be returned
 //    should be returned
 // If everything goes well, then return a Result of a Person object
 //
-// As an aside: `Box<dyn Error>` implements `From<&'_ str>`. This means that if
+// As an aside: `Box<dyn Error>` implements `From<&'_ str>`. This means that if you want to return a
-// you want to return a string error message, you can do so via just using
+// string error message, you can do so via just using return `Err("my error message".into())`.
 // return `Err("my error message".into())`.
 impl FromStr for Person {
    type Err = ParsePersonError;
--- a/exercises/conversions/try_from_into.rs
+++ b/exercises/conversions/try_from_into.rs
@ -1,13 +1,9 @@
 // try_from_into.rs
-//
+// TryFrom is a simple and safe type conversion that may fail in a controlled way under some circumstances.
-// TryFrom is a simple and safe type conversion that may fail in a controlled
+// Basically, this is the same as From. The main difference is that this should return a Result type
-// way under some circumstances. Basically, this is the same as From. The main
+// instead of the target type itself.
-// difference is that this should return a Result type instead of the target
+// You can read more about it at https://doc.rust-lang.org/std/convert/trait.TryFrom.html
-// type itself. You can read more about it at
+// Execute `rustlings hint try_from_into` or use the `hint` watch subcommand for a hint.
 // https://doc.rust-lang.org/std/convert/trait.TryFrom.html
 //
 // Execute `rustlings hint try_from_into` or use the `hint` watch subcommand for
 // a hint.
 use std::convert::{TryFrom, TryInto};
@ -29,13 +25,14 @@ enum IntoColorError {
 // I AM NOT DONE
-// Your task is to complete this implementation and return an Ok result of inner
+// Your task is to complete this implementation
-// type Color. You need to create an implementation for a tuple of three
+// and return an Ok result of inner type Color.
-// integers, an array of three integers, and a slice of integers.
+// You need to create an implementation for a tuple of three integers,
 // an array of three integers, and a slice of integers.
 //
-// Note that the implementation for tuple and array will be checked at compile
+// Note that the implementation for tuple and array will be checked at compile time,
-// time, but the slice implementation needs to check the slice length! Also note
+// but the slice implementation needs to check the slice length!
-// that correct RGB color values must be integers in the 0..=255 range.
+// Also note that correct RGB color values must be integers in the 0..=255 range.
 // Tuple implementation
 impl TryFrom<(i16, i16, i16)> for Color {
--- a/exercises/conversions/using_as.rs
+++ b/exercises/conversions/using_as.rs
@ -1,14 +1,10 @@
-// using_as.rs
+// Type casting in Rust is done via the usage of the `as` operator.
 // Please note that the `as` operator is not only used when type casting.
 // It also helps with renaming imports.
 //
-// Type casting in Rust is done via the usage of the `as` operator. Please note
+// The goal is to make sure that the division does not fail to compile
-// that the `as` operator is not only used when type casting. It also helps with
+// and returns the proper type.
-// renaming imports.
+// Execute `rustlings hint using_as` or use the `hint` watch subcommand for a hint.
 //
 // The goal is to make sure that the division does not fail to compile and
 // returns the proper type.
 //
 // Execute `rustlings hint using_as` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/enums/enums1.rs
+++ b/exercises/enums/enums1.rs
@ -1,5 +1,4 @@
 // enums1.rs
 //
 // No hints this time! ;)
 // I AM NOT DONE
--- a/exercises/enums/enums2.rs
+++ b/exercises/enums/enums2.rs
@ -1,7 +1,5 @@
 // enums2.rs
-//
+// Execute `rustlings hint enums2` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint enums2` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/enums/enums3.rs
+++ b/exercises/enums/enums3.rs
@ -1,9 +1,6 @@
 // enums3.rs
 //
 // Address all the TODOs to make the tests pass!
-//
+// Execute `rustlings hint enums3` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint enums3` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
@ -20,7 +17,6 @@ struct State {
    color: (u8, u8, u8),
    position: Point,
    quit: bool,
    message: String,
 }
 impl State {
@ -32,8 +28,8 @@ impl State {
        self.quit = true;
    }
-    fn echo(&mut self, s: String) {
+    fn echo(&self, s: String) {
-        self.message = s
+        println!("{}", s);
    }
    fn move_position(&mut self, p: Point) {
@ -42,8 +38,7 @@ impl State {
    fn process(&mut self, message: Message) {
        // TODO: create a match expression to process the different message variants
-        // Remember: When passing a tuple as a function argument, you'll need extra parentheses:
+        // Remember: When passing a tuple as a function argument, you'll need extra parentheses: fn function((t, u, p, l, e))
        // fn function((t, u, p, l, e))
    }
 }
@ -57,10 +52,9 @@ mod tests {
            quit: false,
            position: Point { x: 0, y: 0 },
            color: (0, 0, 0),
            message: "hello world".to_string(),
        };
        state.process(Message::ChangeColor(255, 0, 255));
-        state.process(Message::Echo(String::from("Hello world!")));
+        state.process(Message::Echo(String::from("hello world")));
        state.process(Message::Move(Point { x: 10, y: 15 }));
        state.process(Message::Quit);
@ -68,6 +62,5 @@ mod tests {
        assert_eq!(state.position.x, 10);
        assert_eq!(state.position.y, 15);
        assert_eq!(state.quit, true);
        assert_eq!(state.message, "Hello world!");
    }
 }
--- a/exercises/error_handling/errors1.rs
+++ b/exercises/error_handling/errors1.rs
@ -1,13 +1,9 @@
 // errors1.rs
-//
+// This function refuses to generate text to be printed on a nametag if
-// This function refuses to generate text to be printed on a nametag if you pass
+// you pass it an empty string. It'd be nicer if it explained what the problem
-// it an empty string. It'd be nicer if it explained what the problem was,
+// was, instead of just sometimes returning `None`. Thankfully, Rust has a similar
-// instead of just sometimes returning `None`. Thankfully, Rust has a similar
+// construct to `Option` that can be used to express error conditions. Let's use it!
-// construct to `Option` that can be used to express error conditions. Let's use
+// Execute `rustlings hint errors1` or use the `hint` watch subcommand for a hint.
 // it!
 //
 // Execute `rustlings hint errors1` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/error_handling/errors2.rs
+++ b/exercises/error_handling/errors2.rs
@ -1,23 +1,21 @@
 // errors2.rs
 //
 // Say we're writing a game where you can buy items with tokens. All items cost
 // 5 tokens, and whenever you purchase items there is a processing fee of 1
-// token. A player of the game will type in how many items they want to buy, and
+// token. A player of the game will type in how many items they want to buy,
-// the `total_cost` function will calculate the total cost of the tokens. Since
+// and the `total_cost` function will calculate the total cost of the tokens.
-// the player typed in the quantity, though, we get it as a string-- and they
+// Since the player typed in the quantity, though, we get it as a string-- and
-// might have typed anything, not just numbers!
+// they might have typed anything, not just numbers!
-//
+
 // Right now, this function isn't handling the error case at all (and isn't
-// handling the success case properly either). What we want to do is: if we call
+// handling the success case properly either). What we want to do is:
-// the `total_cost` function on a string that is not a number, that function
+// if we call the `parse` function on a string that is not a number, that
-// will return a `ParseIntError`, and in that case, we want to immediately
+// function will return a `ParseIntError`, and in that case, we want to
-// return that error from our function and not try to multiply and add.
+// immediately return that error from our function and not try to multiply
-//
+// and add.
-// There are at least two ways to implement this that are both correct-- but one
+
-// is a lot shorter!
+// There are at least two ways to implement this that are both correct-- but
-//
+// one is a lot shorter!
-// Execute `rustlings hint errors2` or use the `hint` watch subcommand for a
+// Execute `rustlings hint errors2` or use the `hint` watch subcommand for a hint.
 // hint.
 // I AM NOT DONE
--- a/exercises/error_handling/errors3.rs
+++ b/exercises/error_handling/errors3.rs
@ -1,11 +1,8 @@
 // errors3.rs
 //
 // This is a program that is trying to use a completed version of the
 // `total_cost` function from the previous exercise. It's not working though!
 // Why not? What should we do to fix it?
-//
+// Execute `rustlings hint errors3` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint errors3` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/error_handling/errors4.rs
+++ b/exercises/error_handling/errors4.rs
@ -1,7 +1,5 @@
 // errors4.rs
-//
+// Execute `rustlings hint errors4` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint errors4` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
@ -16,7 +14,7 @@ enum CreationError {
 impl PositiveNonzeroInteger {
    fn new(value: i64) -> Result<PositiveNonzeroInteger, CreationError> {
-        // Hmm... Why is this always returning an Ok value?
+        // Hmm...? Why is this only returning an Ok value?
        Ok(PositiveNonzeroInteger(value as u64))
    }
 }
--- a/exercises/error_handling/errors5.rs
+++ b/exercises/error_handling/errors5.rs
@ -1,26 +1,20 @@
 // errors5.rs
-//
+
 // This program uses an altered version of the code from errors4.
-//
+
-// This exercise uses some concepts that we won't get to until later in the
+// This exercise uses some concepts that we won't get to until later in the course, like `Box` and the
-// course, like `Box` and the `From` trait. It's not important to understand
+// `From` trait. It's not important to understand them in detail right now, but you can read ahead if you like.
-// them in detail right now, but you can read ahead if you like. For now, think
+// For now, think of the `Box<dyn ???>` type as an "I want anything that does ???" type, which, given
-// of the `Box<dyn ???>` type as an "I want anything that does ???" type, which,
+// Rust's usual standards for runtime safety, should strike you as somewhat lenient!
-// given Rust's usual standards for runtime safety, should strike you as
+
-// somewhat lenient!
+// In short, this particular use case for boxes is for when you want to own a value and you care only that it is a
-//
+// type which implements a particular trait. To do so, The Box is declared as of type Box<dyn Trait> where Trait is the trait
-// In short, this particular use case for boxes is for when you want to own a
+// the compiler looks for on any value used in that context. For this exercise, that context is the potential errors
-// value and you care only that it is a type which implements a particular
+// which can be returned in a Result.
-// trait. To do so, The Box is declared as of type Box<dyn Trait> where Trait is
+
-// the trait the compiler looks for on any value used in that context. For this
+// What can we use to describe both errors? In other words, is there a trait which both errors implement?
-// exercise, that context is the potential errors which can be returned in a
+
-// Result.
+// Execute `rustlings hint errors5` or use the `hint` watch subcommand for a hint.
 //
 // What can we use to describe both errors? In other words, is there a trait
 // which both errors implement?
 //
 // Execute `rustlings hint errors5` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/error_handling/errors6.rs
+++ b/exercises/error_handling/errors6.rs
@ -1,13 +1,12 @@
 // errors6.rs
-//
+
 // Using catch-all error types like `Box<dyn error::Error>` isn't recommended
 // for library code, where callers might want to make decisions based on the
-// error content, instead of printing it out or propagating it further. Here, we
+// error content, instead of printing it out or propagating it further. Here,
-// define a custom error type to make it possible for callers to decide what to
+// we define a custom error type to make it possible for callers to decide
-// do next when our function returns an error.
+// what to do next when our function returns an error.
-//
+
-// Execute `rustlings hint errors6` or use the `hint` watch subcommand for a
+// Execute `rustlings hint errors6` or use the `hint` watch subcommand for a hint.
 // hint.
 // I AM NOT DONE
--- a/exercises/functions/functions1.rs
+++ b/exercises/functions/functions1.rs
@ -1,7 +1,5 @@
 // functions1.rs
-//
+// Execute `rustlings hint functions1` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint functions1` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/functions/functions2.rs
+++ b/exercises/functions/functions2.rs
@ -1,7 +1,5 @@
 // functions2.rs
-//
+// Execute `rustlings hint functions2` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint functions2` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/functions/functions3.rs
+++ b/exercises/functions/functions3.rs
@ -1,7 +1,5 @@
 // functions3.rs
-//
+// Execute `rustlings hint functions3` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint functions3` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/functions/functions4.rs
+++ b/exercises/functions/functions4.rs
@ -1,12 +1,11 @@
 // functions4.rs
-//
+// Execute `rustlings hint functions4` or use the `hint` watch subcommand for a hint.
-// This store is having a sale where if the price is an even number, you get 10
+
-// Rustbucks off, but if it's an odd number, it's 3 Rustbucks off. (Don't worry
+// This store is having a sale where if the price is an even number, you get
-// about the function bodies themselves, we're only interested in the signatures
+// 10 Rustbucks off, but if it's an odd number, it's 3 Rustbucks off.
-// for now. If anything, this is a good way to peek ahead to future exercises!)
+// (Don't worry about the function bodies themselves, we're only interested
-//
+// in the signatures for now. If anything, this is a good way to peek ahead
-// Execute `rustlings hint functions4` or use the `hint` watch subcommand for a
+// to future exercises!)
 // hint.
 // I AM NOT DONE
--- a/exercises/functions/functions5.rs
+++ b/exercises/functions/functions5.rs
@ -1,7 +1,5 @@
 // functions5.rs
-//
+// Execute `rustlings hint functions5` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint functions5` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/generics/generics1.rs
+++ b/exercises/generics/generics1.rs
@ -1,10 +1,7 @@
-// generics1.rs
+// This shopping list program isn't compiling!
-//
+// Use your knowledge of generics to fix it.
-// This shopping list program isn't compiling! Use your knowledge of generics to
+
-// fix it.
+// Execute `rustlings hint generics1` or use the `hint` watch subcommand for a hint.
 //
 // Execute `rustlings hint generics1` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/generics/generics2.rs
+++ b/exercises/generics/generics2.rs
@ -1,10 +1,7 @@
 // generics2.rs
 //
 // This powerful wrapper provides the ability to store a positive integer value.
 // Rewrite it using generics so that it supports wrapping ANY type.
-//
+
-// Execute `rustlings hint generics2` or use the `hint` watch subcommand for a
+// Execute `rustlings hint generics2` or use the `hint` watch subcommand for a hint.
 // hint.
 // I AM NOT DONE
--- a/exercises/hashmaps/hashmaps1.rs
+++ b/exercises/hashmaps/hashmaps1.rs
@ -1,15 +1,14 @@
 // hashmaps1.rs
-//
+// A basket of fruits in the form of a hash map needs to be defined.
-// A basket of fruits in the form of a hash map needs to be defined. The key
+// The key represents the name of the fruit and the value represents
-// represents the name of the fruit and the value represents how many of that
+// how many of that particular fruit is in the basket. You have to put
-// particular fruit is in the basket. You have to put at least three different
+// at least three different types of fruits (e.g apple, banana, mango)
-// types of fruits (e.g apple, banana, mango) in the basket and the total count
+// in the basket and the total count of all the fruits should be at
-// of all the fruits should be at least five.
+// least five.
 //
 // Make me compile and pass the tests!
 //
-// Execute `rustlings hint hashmaps1` or use the `hint` watch subcommand for a
+// Execute `rustlings hint hashmaps1` or use the `hint` watch subcommand for a hint.
 // hint.
 // I AM NOT DONE
--- a/exercises/hashmaps/hashmaps2.rs
+++ b/exercises/hashmaps/hashmaps2.rs
@ -1,18 +1,17 @@
 // hashmaps2.rs
-//
+// We're collecting different fruits to bake a delicious fruit cake.
-// We're collecting different fruits to bake a delicious fruit cake. For this,
+// For this, we have a basket, which we'll represent in the form of a hash
-// we have a basket, which we'll represent in the form of a hash map. The key
+// map. The key represents the name of each fruit we collect and the value
-// represents the name of each fruit we collect and the value represents how
+// represents how many of that particular fruit we have collected.
-// many of that particular fruit we have collected. Three types of fruits -
+// Three types of fruits - Apple (4), Mango (2) and Lychee (5) are already
-// Apple (4), Mango (2) and Lychee (5) are already in the basket hash map. You
+// in the basket hash map.
-// must add fruit to the basket so that there is at least one of each kind and
+// You must add fruit to the basket so that there is at least
-// more than 11 in total - we have a lot of mouths to feed. You are not allowed
+// one of each kind and more than 11 in total - we have a lot of mouths to feed.
-// to insert any more of these fruits!
+// You are not allowed to insert any more of these fruits!
 //
 // Make me pass the tests!
 //
-// Execute `rustlings hint hashmaps2` or use the `hint` watch subcommand for a
+// Execute `rustlings hint hashmaps2` or use the `hint` watch subcommand for a hint.
 // hint.
 // I AM NOT DONE
@ -37,9 +36,9 @@ fn fruit_basket(basket: &mut HashMap<Fruit, u32>) {
    ];
    for fruit in fruit_kinds {
-        // TODO: Insert new fruits if they are not already present in the
+        // TODO: Insert new fruits if they are not already present in the basket.
-        // basket. Note that you are not allowed to put any type of fruit that's
+        // Note that you are not allowed to put any type of fruit that's already
-        // already present!
+        // present!
    }
 }
@ -81,13 +80,4 @@ mod tests {
        let count = basket.values().sum::<u32>();
        assert!(count > 11);
    }
    #[test]
    fn all_fruit_types_in_basket() {
        let mut basket = get_fruit_basket();
        fruit_basket(&mut basket);
        for amount in basket.values() {
            assert_ne!(amount, &0);
        }
    }
 }
--- a/exercises/hashmaps/hashmaps3.rs
+++ b/exercises/hashmaps/hashmaps3.rs
@ -1,25 +1,26 @@
 // hashmaps3.rs
-//
+
-// A list of scores (one per line) of a soccer match is given. Each line is of
+// A list of scores (one per line) of a soccer match is given. Each line
-// the form : "<team_1_name>,<team_2_name>,<team_1_goals>,<team_2_goals>"
+// is of the form :
 // <team_1_name>,<team_2_name>,<team_1_goals>,<team_2_goals>
 // Example: England,France,4,2 (England scored 4 goals, France 2).
-//
+
-// You have to build a scores table containing the name of the team, goals the
+// You have to build a scores table containing the name of the team, goals
-// team scored, and goals the team conceded. One approach to build the scores
+// the team scored, and goals the team conceded. One approach to build
-// table is to use a Hashmap. The solution is partially written to use a
+// the scores table is to use a Hashmap. The solution is partially
-// Hashmap, complete it to pass the test.
+// written to use a Hashmap, complete it to pass the test.
-//
+
 // Make me pass the tests!
-//
+
-// Execute `rustlings hint hashmaps3` or use the `hint` watch subcommand for a
+// Execute `rustlings hint hashmaps3` or use the `hint` watch subcommand for a hint.
 // hint.
 // I AM NOT DONE
 use std::collections::HashMap;
-// A structure to store the goal details of a team.
+// A structure to store team name and its goal details.
 struct Team {
    name: String,
    goals_scored: u8,
    goals_conceded: u8,
 }
--- a/exercises/if/if1.rs
+++ b/exercises/if/if1.rs
@ -1,5 +1,4 @@
 // if1.rs
 //
 // Execute `rustlings hint if1` or use the `hint` watch subcommand for a hint.
 // I AM NOT DONE
@ -25,9 +24,4 @@ mod tests {
    fn fortytwo_is_bigger_than_thirtytwo() {
        assert_eq!(42, bigger(32, 42));
    }
    #[test]
    fn equal_numbers() {
        assert_eq!(42, bigger(42, 42));
    }
 }
--- a/exercises/if/if2.rs
+++ b/exercises/if/if2.rs
@ -1,8 +1,7 @@
 // if2.rs
-//
+
 // Step 1: Make me compile!
 // Step 2: Get the bar_for_fuzz and default_to_baz tests passing!
 //
 // Execute `rustlings hint if2` or use the `hint` watch subcommand for a hint.
 // I AM NOT DONE
--- a/exercises/if/if3.rs
+++ b/exercises/if/if3.rs
@ -1,56 +0,0 @@
 // if3.rs
 //
 // Execute `rustlings hint if3` or use the `hint` watch subcommand for a hint.
 // I AM NOT DONE
 pub fn animal_habitat(animal: &str) -> &'static str {
    let identifier = if animal == "crab" {
        1
    } else if animal == "gopher" {
        2.0
    } else if animal == "snake" {
        3
    } else {
        "Unknown"
    };
    // DO NOT CHANGE THIS STATEMENT BELOW
    let habitat = if identifier == 1 {
        "Beach"
    } else if identifier == 2 {
        "Burrow"
    } else if identifier == 3 {
        "Desert"
    } else {
        "Unknown"
    };
    habitat
 }
 // No test changes needed.
 #[cfg(test)]
 mod tests {
    use super::*;
    #[test]
    fn gopher_lives_in_burrow() {
        assert_eq!(animal_habitat("gopher"), "Burrow")
    }
    #[test]
    fn snake_lives_in_desert() {
        assert_eq!(animal_habitat("snake"), "Desert")
    }
    #[test]
    fn crab_lives_on_beach() {
        assert_eq!(animal_habitat("crab"), "Beach")
    }
    #[test]
    fn unknown_animal() {
        assert_eq!(animal_habitat("dinosaur"), "Unknown")
    }
 }
--- a/exercises/intro/intro1.rs
+++ b/exercises/intro/intro1.rs
@ -1,17 +1,13 @@
 // intro1.rs
 //
 // About this `I AM NOT DONE` thing:
 // We sometimes encourage you to keep trying things on a given exercise, even
 // after you already figured it out. If you got everything working and feel
 // ready for the next exercise, remove the `I AM NOT DONE` comment below.
 // Execute `rustlings hint intro1` or use the `hint` watch subcommand for a hint.
 //
-// If you're running this using `rustlings watch`: The exercise file will be
+// If you're running this using `rustlings watch`: The exercise file will be reloaded
-// reloaded when you change one of the lines below! Try adding a `println!`
+// when you change one of the lines below! Try adding a `println!` line, or try changing
-// line, or try changing what it outputs in your terminal. Try removing a
+// what it outputs in your terminal. Try removing a semicolon and see what happens!
 // semicolon and see what happens!
 //
 // Execute `rustlings hint intro1` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/intro/intro2.rs
+++ b/exercises/intro/intro2.rs
@ -1,9 +1,6 @@
 // intro2.rs
 //
 // Make the code print a greeting to the world.
-//
+// Execute `rustlings hint intro2` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint intro2` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/iterators/iterators1.rs
+++ b/exercises/iterators/iterators1.rs
@ -1,17 +1,15 @@
 // iterators1.rs
 //
 // When performing operations on elements within a collection, iterators are
 // essential. This module helps you get familiar with the structure of using an
 // iterator and how to go through elements within an iterable collection.
 //
 //  Make me compile by filling in the `???`s
 //
-// Execute `rustlings hint iterators1` or use the `hint` watch subcommand for a
+// When performing operations on elements within a collection, iterators are essential.
-// hint.
+// This module helps you get familiar with the structure of using an iterator and
 // how to go through elements within an iterable collection.
 //
 // Execute `rustlings hint iterators1` or use the `hint` watch subcommand for a hint.
 // I AM NOT DONE
 #[test]
 fn main() {
    let my_fav_fruits = vec!["banana", "custard apple", "avocado", "peach", "raspberry"];
--- a/exercises/iterators/iterators2.rs
+++ b/exercises/iterators/iterators2.rs
@ -1,10 +1,7 @@
 // iterators2.rs
 //
 // In this exercise, you'll learn some of the unique advantages that iterators
 // can offer. Follow the steps to complete the exercise.
-//
+// Execute `rustlings hint iterators2` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint iterators2` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/iterators/iterators3.rs
+++ b/exercises/iterators/iterators3.rs
@ -1,13 +1,10 @@
 // iterators3.rs
-//
+// This is a bigger exercise than most of the others! You can do it!
-// This is a bigger exercise than most of the others! You can do it! Here is
+// Here is your mission, should you choose to accept it:
 // your mission, should you choose to accept it:
 // 1. Complete the divide function to get the first four tests to pass.
 // 2. Get the remaining tests to pass by completing the result_with_list and
 //    list_of_results functions.
-//
+// Execute `rustlings hint iterators3` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint iterators3` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
@ -29,16 +26,14 @@ pub fn divide(a: i32, b: i32) -> Result<i32, DivisionError> {
    todo!();
 }
-// Complete the function and return a value of the correct type so the test
+// Complete the function and return a value of the correct type so the test passes.
 // passes.
 // Desired output: Ok([1, 11, 1426, 3])
 fn result_with_list() -> () {
    let numbers = vec![27, 297, 38502, 81];
    let division_results = numbers.into_iter().map(|n| divide(n, 27));
 }
-// Complete the function and return a value of the correct type so the test
+// Complete the function and return a value of the correct type so the test passes.
 // passes.
 // Desired output: [Ok(1), Ok(11), Ok(1426), Ok(3)]
 fn list_of_results() -> () {
    let numbers = vec![27, 297, 38502, 81];
--- a/exercises/iterators/iterators4.rs
+++ b/exercises/iterators/iterators4.rs
@ -1,7 +1,5 @@
 // iterators4.rs
-//
+// Execute `rustlings hint iterators4` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint iterators4` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/iterators/iterators5.rs
+++ b/exercises/iterators/iterators5.rs
@ -1,5 +1,4 @@
 // iterators5.rs
 //
 // Let's define a simple model to track Rustlings exercise progress. Progress
 // will be modelled using a hash map. The name of the exercise is the key and
 // the progress is the value. Two counting functions were created to count the
@ -7,9 +6,7 @@
 // functionality using iterators. Try not to use imperative loops (for, while).
 // Only the two iterator methods (count_iterator and count_collection_iterator)
 // need to be modified.
-//
+// Execute `rustlings hint iterators5` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint iterators5` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
@ -68,28 +65,13 @@ mod tests {
    }
    #[test]
-    fn count_some() {
+    fn count_equals_for() {
        let map = get_map();
        assert_eq!(1, count_iterator(&map, Progress::Some));
    }
    #[test]
    fn count_none() {
        let map = get_map();
        assert_eq!(2, count_iterator(&map, Progress::None));
    }
    #[test]
    fn count_complete_equals_for() {
        let map = get_map();
        let progress_states = vec![Progress::Complete, Progress::Some, Progress::None];
        for progress_state in progress_states {
        assert_eq!(
-                count_for(&map, progress_state),
+            count_for(&map, Progress::Complete),
-                count_iterator(&map, progress_state)
+            count_iterator(&map, Progress::Complete)
        );
    }
    }
    #[test]
    fn count_collection_complete() {
@ -100,30 +82,14 @@ mod tests {
        );
    }
    #[test]
    fn count_collection_some() {
        let collection = get_vec_map();
        assert_eq!(1, count_collection_iterator(&collection, Progress::Some));
    }
    #[test]
    fn count_collection_none() {
        let collection = get_vec_map();
        assert_eq!(4, count_collection_iterator(&collection, Progress::None));
    }
    #[test]
    fn count_collection_equals_for() {
        let progress_states = vec![Progress::Complete, Progress::Some, Progress::None];
        let collection = get_vec_map();
        for progress_state in progress_states {
        assert_eq!(
-                count_collection_for(&collection, progress_state),
+            count_collection_for(&collection, Progress::Complete),
-                count_collection_iterator(&collection, progress_state)
+            count_collection_iterator(&collection, Progress::Complete)
        );
    }
    }
    fn get_map() -> HashMap<String, Progress> {
        use Progress::*;
--- a/exercises/lifetimes/lifetimes1.rs
+++ b/exercises/lifetimes/lifetimes1.rs
@ -1,12 +1,11 @@
 // lifetimes1.rs
 //
 // The Rust compiler needs to know how to check whether supplied references are
-// valid, so that it can let the programmer know if a reference is at risk of
+// valid, so that it can let the programmer know if a reference is at risk
-// going out of scope before it is used. Remember, references are borrows and do
+// of going out of scope before it is used. Remember, references are borrows
-// not own their own data. What if their owner goes out of scope?
+// and do not own their own data. What if their owner goes out of scope?
 //
-// Execute `rustlings hint lifetimes1` or use the `hint` watch subcommand for a
+// Execute `rustlings hint lifetimes1` or use the `hint` watch subcommand for a hint.
 // hint.
 // I AM NOT DONE
--- a/exercises/lifetimes/lifetimes2.rs
+++ b/exercises/lifetimes/lifetimes2.rs
@ -1,10 +1,10 @@
 // lifetimes2.rs
 //
-// So if the compiler is just validating the references passed to the annotated
+// So if the compiler is just validating the references passed
-// parameters and the return type, what do we need to change?
+// to the annotated parameters and the return type, what do
 // we need to change?
 //
-// Execute `rustlings hint lifetimes2` or use the `hint` watch subcommand for a
+// Execute `rustlings hint lifetimes2` or use the `hint` watch subcommand for a hint.
 // hint.
 // I AM NOT DONE
--- a/exercises/lifetimes/lifetimes3.rs
+++ b/exercises/lifetimes/lifetimes3.rs
@ -2,8 +2,7 @@
 //
 // Lifetimes are also needed when structs hold references.
 //
-// Execute `rustlings hint lifetimes3` or use the `hint` watch subcommand for a
+// Execute `rustlings hint lifetimes3` or use the `hint` watch subcommand for a hint.
 // hint.
 // I AM NOT DONE
--- a/exercises/macros/macros1.rs
+++ b/exercises/macros/macros1.rs
@ -1,7 +1,5 @@
 // macros1.rs
-//
+// Execute `rustlings hint macros1` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint macros1` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/macros/macros2.rs
+++ b/exercises/macros/macros2.rs
@ -1,7 +1,5 @@
 // macros2.rs
-//
+// Execute `rustlings hint macros2` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint macros2` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/macros/macros3.rs
+++ b/exercises/macros/macros3.rs
@ -1,9 +1,6 @@
 // macros3.rs
 //
 // Make me compile, without taking the macro out of the module!
-//
+// Execute `rustlings hint macros3` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint macros3` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/macros/macros4.rs
+++ b/exercises/macros/macros4.rs
@ -1,7 +1,5 @@
 // macros4.rs
-//
+// Execute `rustlings hint macros4` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint macros4` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/modules/modules1.rs
+++ b/exercises/modules/modules1.rs
@ -1,7 +1,5 @@
 // modules1.rs
-//
+// Execute `rustlings hint modules1` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint modules1` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/modules/modules2.rs
+++ b/exercises/modules/modules2.rs
@ -1,11 +1,7 @@
 // modules2.rs
-//
+// You can bring module paths into scopes and provide new names for them with the
-// You can bring module paths into scopes and provide new names for them with
+// 'use' and 'as' keywords. Fix these 'use' statements to make the code compile.
-// the 'use' and 'as' keywords. Fix these 'use' statements to make the code
+// Execute `rustlings hint modules2` or use the `hint` watch subcommand for a hint.
 // compile.
 //
 // Execute `rustlings hint modules2` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/modules/modules3.rs
+++ b/exercises/modules/modules3.rs
@ -1,12 +1,9 @@
 // modules3.rs
-//
+// You can use the 'use' keyword to bring module paths from modules from anywhere
-// You can use the 'use' keyword to bring module paths from modules from
+// and especially from the Rust standard library into your scope.
-// anywhere and especially from the Rust standard library into your scope. Bring
+// Bring SystemTime and UNIX_EPOCH
-// SystemTime and UNIX_EPOCH from the std::time module. Bonus style points if
+// from the std::time module. Bonus style points if you can do it with one line!
-// you can do it with one line!
+// Execute `rustlings hint modules3` or use the `hint` watch subcommand for a hint.
 //
 // Execute `rustlings hint modules3` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/move_semantics/move_semantics1.rs
+++ b/exercises/move_semantics/move_semantics1.rs
@ -1,23 +1,26 @@
 // move_semantics1.rs
-//
+// Execute `rustlings hint move_semantics1` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint move_semantics1` or use the `hint` watch subcommand
 // for a hint.
 // I AM NOT DONE
 #[test]
 fn main() {
-    let vec0 = vec![22, 44, 66];
+    let vec0 = Vec::new();
    let vec1 = fill_vec(vec0);
-    assert_eq!(vec1, vec![22, 44, 66, 88]);
+    println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
    vec1.push(88);
    println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
 }
 fn fill_vec(vec: Vec<i32>) -> Vec<i32> {
-    let vec = vec;
+    let mut vec = vec;
-    vec.push(88);
+    vec.push(22);
    vec.push(44);
    vec.push(66);
    vec
 }
--- a/exercises/move_semantics/move_semantics2.rs
+++ b/exercises/move_semantics/move_semantics2.rs
@ -1,26 +1,32 @@
 // move_semantics2.rs
-//
+// Execute `rustlings hint move_semantics2` or use the `hint` watch subcommand for a hint.
-// Make the test pass by finding a way to keep both Vecs separate!
+
-//
+// Expected output:
-// Execute `rustlings hint move_semantics2` or use the `hint` watch subcommand
+// vec0 has length 3 content `[22, 44, 66]`
-// for a hint.
+// vec1 has length 4 content `[22, 44, 66, 88]`
 // I AM NOT DONE
 #[test]
 fn main() {
-    let vec0 = vec![22, 44, 66];
+    let vec0 = Vec::new();
    // Do not move the following line!
    let mut vec1 = fill_vec(vec0);
-    assert_eq!(vec0, vec![22, 44, 66]);
+    // Do not change the following line!
-    assert_eq!(vec1, vec![22, 44, 66, 88]);
+    println!("{} has length {} content `{:?}`", "vec0", vec0.len(), vec0);
    vec1.push(88);
    println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
 }
 fn fill_vec(vec: Vec<i32>) -> Vec<i32> {
    let mut vec = vec;
-    vec.push(88);
+    vec.push(22);
    vec.push(44);
    vec.push(66);
    vec
 }
--- a/exercises/move_semantics/move_semantics3.rs
+++ b/exercises/move_semantics/move_semantics3.rs
@ -1,24 +1,26 @@
 // move_semantics3.rs
-//
+// Make me compile without adding new lines-- just changing existing lines!
-// Make me compile without adding new lines -- just changing existing lines! (no
+// (no lines with multiple semicolons necessary!)
-// lines with multiple semicolons necessary!)
+// Execute `rustlings hint move_semantics3` or use the `hint` watch subcommand for a hint.
 //
 // Execute `rustlings hint move_semantics3` or use the `hint` watch subcommand
 // for a hint.
 // I AM NOT DONE
 #[test]
 fn main() {
-    let vec0 = vec![22, 44, 66];
+    let vec0 = Vec::new();
    let mut vec1 = fill_vec(vec0);
-    assert_eq!(vec1, vec![22, 44, 66, 88]);
+    println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
    vec1.push(88);
    println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
 }
 fn fill_vec(vec: Vec<i32>) -> Vec<i32> {
-    vec.push(88);
+    vec.push(22);
    vec.push(44);
    vec.push(66);
    vec
 }
--- a/exercises/move_semantics/move_semantics4.rs
+++ b/exercises/move_semantics/move_semantics4.rs
@ -1,29 +1,30 @@
 // move_semantics4.rs
-//
+// Refactor this code so that instead of passing `vec0` into the `fill_vec` function,
-// Refactor this code so that instead of passing `vec0` into the `fill_vec`
+// the Vector gets created in the function itself and passed back to the main
-// function, the Vector gets created in the function itself and passed back to
+// function.
-// the main function.
+// Execute `rustlings hint move_semantics4` or use the `hint` watch subcommand for a hint.
 //
 // Execute `rustlings hint move_semantics4` or use the `hint` watch subcommand
 // for a hint.
 // I AM NOT DONE
 #[test]
 fn main() {
-    let vec0 = vec![22, 44, 66];
+    let vec0 = Vec::new();
    let mut vec1 = fill_vec(vec0);
-    assert_eq!(vec1, vec![22, 44, 66, 88]);
+    println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
    vec1.push(88);
    println!("{} has length {} content `{:?}`", "vec1", vec1.len(), vec1);
 }
-// `fill_vec()` no longer takes `vec: Vec<i32>` as argument - don't change this!
+// `fill_vec()` no longer takes `vec: Vec<i32>` as argument
 fn fill_vec() -> Vec<i32> {
    // Instead, let's create and fill the Vec in here - how do you do that?
    let mut vec = vec;
-    vec.push(88);
+    vec.push(22);
    vec.push(44);
    vec.push(66);
    vec
 }
--- a/exercises/move_semantics/move_semantics5.rs
+++ b/exercises/move_semantics/move_semantics5.rs
@ -1,14 +1,10 @@
 // move_semantics5.rs
-//
+// Make me compile only by reordering the lines in `main()`, but without
-// Make me compile only by reordering the lines in `main()`, but without adding,
+// adding, changing or removing any of them.
-// changing or removing any of them.
+// Execute `rustlings hint move_semantics5` or use the `hint` watch subcommand for a hint.
 //
 // Execute `rustlings hint move_semantics5` or use the `hint` watch subcommand
 // for a hint.
 // I AM NOT DONE
 #[test]
 fn main() {
    let mut x = 100;
    let y = &mut x;
--- a/exercises/move_semantics/move_semantics6.rs
+++ b/exercises/move_semantics/move_semantics6.rs
@ -1,9 +1,6 @@
 // move_semantics6.rs
-//
+// Execute `rustlings hint move_semantics6` or use the `hint` watch subcommand for a hint.
 // You can't change anything except adding or removing references.
 //
 // Execute `rustlings hint move_semantics6` or use the `hint` watch subcommand
 // for a hint.
 // I AM NOT DONE
--- a/exercises/options/options1.rs
+++ b/exercises/options/options1.rs
@ -1,7 +1,5 @@
 // options1.rs
-//
+// Execute `rustlings hint options1` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint options1` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
@ -9,9 +7,8 @@
 // If it's before 10PM, there's 5 pieces left. At 10PM, someone eats them
 // all, so there'll be no more left :(
 fn maybe_icecream(time_of_day: u16) -> Option<u16> {
-    // We use the 24-hour system here, so 10PM is a value of 22 and 12AM is a
+    // We use the 24-hour system here, so 10PM is a value of 22 and 12AM is a value of 0
-    // value of 0 The Option output should gracefully handle cases where
+    // The Option output should gracefully handle cases where time_of_day > 23.
    // time_of_day > 23.
    // TODO: Complete the function body - remember to return an Option!
    ???
 }
@ -31,8 +28,7 @@ mod tests {
    #[test]
    fn raw_value() {
-        // TODO: Fix this test. How do you get at the value contained in the
+        // TODO: Fix this test. How do you get at the value contained in the Option?
        // Option?
        let icecreams = maybe_icecream(12);
        assert_eq!(icecreams, 5);
    }
--- a/exercises/options/options2.rs
+++ b/exercises/options/options2.rs
@ -1,7 +1,5 @@
 // options2.rs
-//
+// Execute `rustlings hint options2` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint options2` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
@ -29,9 +27,8 @@ mod tests {
        let mut cursor = range;
-        // TODO: make this a while let statement - remember that vector.pop also
+        // TODO: make this a while let statement - remember that vector.pop also adds another layer of Option<T>
-        // adds another layer of Option<T>. You can stack `Option<T>`s into
+        // You can stack `Option<T>`s into while let and if let
        // while let and if let.
        integer = optional_integers.pop() {
            assert_eq!(integer, cursor);
            cursor -= 1;
--- a/exercises/options/options3.rs
+++ b/exercises/options/options3.rs
@ -1,7 +1,5 @@
 // options3.rs
-//
+// Execute `rustlings hint options3` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint options3` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/primitive_types/primitive_types1.rs
+++ b/exercises/primitive_types/primitive_types1.rs
@ -1,7 +1,6 @@
 // primitive_types1.rs
-//
+// Fill in the rest of the line that has code missing!
-// Fill in the rest of the line that has code missing! No hints, there's no
+// No hints, there's no tricks, just get used to typing these :)
 // tricks, just get used to typing these :)
 // I AM NOT DONE
--- a/exercises/primitive_types/primitive_types2.rs
+++ b/exercises/primitive_types/primitive_types2.rs
@ -1,7 +1,6 @@
 // primitive_types2.rs
-//
+// Fill in the rest of the line that has code missing!
-// Fill in the rest of the line that has code missing! No hints, there's no
+// No hints, there's no tricks, just get used to typing these :)
 // tricks, just get used to typing these :)
 // I AM NOT DONE
--- a/exercises/primitive_types/primitive_types3.rs
+++ b/exercises/primitive_types/primitive_types3.rs
@ -1,9 +1,6 @@
 // primitive_types3.rs
 //
 // Create an array with at least 100 elements in it where the ??? is.
-//
+// Execute `rustlings hint primitive_types3` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint primitive_types3` or use the `hint` watch subcommand
 // for a hint.
 // I AM NOT DONE
@ -14,6 +11,5 @@ fn main() {
        println!("Wow, that's a big array!");
    } else {
        println!("Meh, I eat arrays like that for breakfast.");
        panic!("Array not big enough, more elements needed")
    }
 }
--- a/exercises/primitive_types/primitive_types4.rs
+++ b/exercises/primitive_types/primitive_types4.rs
@ -1,9 +1,6 @@
 // primitive_types4.rs
 //
 // Get a slice out of Array a where the ??? is so that the test passes.
-//
+// Execute `rustlings hint primitive_types4` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint primitive_types4` or use the `hint` watch subcommand
 // for a hint.
 // I AM NOT DONE
--- a/exercises/primitive_types/primitive_types5.rs
+++ b/exercises/primitive_types/primitive_types5.rs
@ -1,9 +1,6 @@
 // primitive_types5.rs
 //
 // Destructure the `cat` tuple so that the println will work.
-//
+// Execute `rustlings hint primitive_types5` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint primitive_types5` or use the `hint` watch subcommand
 // for a hint.
 // I AM NOT DONE
--- a/exercises/primitive_types/primitive_types6.rs
+++ b/exercises/primitive_types/primitive_types6.rs
@ -1,10 +1,7 @@
 // primitive_types6.rs
-//
+// Use a tuple index to access the second element of `numbers`.
-// Use a tuple index to access the second element of `numbers`. You can put the
+// You can put the expression for the second element where ??? is so that the test passes.
-// expression for the second element where ??? is so that the test passes.
+// Execute `rustlings hint primitive_types6` or use the `hint` watch subcommand for a hint.
 //
 // Execute `rustlings hint primitive_types6` or use the `hint` watch subcommand
 // for a hint.
 // I AM NOT DONE
--- a/exercises/quiz1.rs
+++ b/exercises/quiz1.rs
@ -1,17 +1,14 @@
 // quiz1.rs
 //
 // This is a quiz for the following sections:
 // - Variables
 // - Functions
 // - If
-//
+
 // Mary is buying apples. The price of an apple is calculated as follows:
 // - An apple costs 2 rustbucks.
 // - If Mary buys more than 40 apples, each apple only costs 1 rustbuck!
-// Write a function that calculates the price of an order of apples given the
+// Write a function that calculates the price of an order of apples given
-// quantity bought.
+// the quantity bought. No hints this time!
 //
 // No hints this time ;)
 // I AM NOT DONE
--- a/exercises/quiz2.rs
+++ b/exercises/quiz2.rs
@ -1,15 +1,14 @@
 // quiz2.rs
 //
 // This is a quiz for the following sections:
 // - Strings
 // - Vecs
 // - Move semantics
 // - Modules
 // - Enums
-//
+
-// Let's build a little machine in the form of a function. As input, we're going
+// Let's build a little machine in the form of a function.
-// to give a list of strings and commands. These commands determine what action
+// As input, we're going to give a list of strings and commands. These commands
-// is going to be applied to the string. It can either be:
+// determine what action is going to be applied to the string. It can either be:
 // - Uppercase the string
 // - Trim the string
 // - Append "bar" to the string a specified amount of times
@ -17,7 +16,6 @@
 // - The input is going to be a Vector of a 2-length tuple,
 //   the first element is the string, the second one is the command.
 // - The output element is going to be a Vector of strings.
 //
 // No hints this time!
 // I AM NOT DONE
--- a/exercises/quiz3.rs
+++ b/exercises/quiz3.rs
@ -1,19 +1,17 @@
 // quiz3.rs
 //
 // This quiz tests:
 // - Generics
 // - Traits
-//
+// An imaginary magical school has a new report card generation system written in Rust!
-// An imaginary magical school has a new report card generation system written
+// Currently the system only supports creating report cards where the student's grade
-// in Rust! Currently the system only supports creating report cards where the
+// is represented numerically (e.g. 1.0 -> 5.5).
-// student's grade is represented numerically (e.g. 1.0 -> 5.5). However, the
+// However, the school also issues alphabetical grades (A+ -> F-) and needs
-// school also issues alphabetical grades (A+ -> F-) and needs to be able to
+// to be able to print both types of report card!
-// print both types of report card!
+
 //
 // Make the necessary code changes in the struct ReportCard and the impl block
-// to support alphabetical report cards. Change the Grade in the second test to
+// to support alphabetical report cards. Change the Grade in the second test to "A+"
-// "A+" to show that your changes allow alphabetical grades.
+// to show that your changes allow alphabetical grades.
-//
+
 // Execute `rustlings hint quiz3` or use the `hint` watch subcommand for a hint.
 // I AM NOT DONE
--- a/exercises/smart_pointers/arc1.rs
+++ b/exercises/smart_pointers/arc1.rs
@ -1,24 +1,21 @@
 // arc1.rs
-//
+// In this exercise, we are given a Vec of u32 called "numbers" with values ranging
-// In this exercise, we are given a Vec of u32 called "numbers" with values
+// from 0 to 99 -- [ 0, 1, 2, ..., 98, 99 ]
-// ranging from 0 to 99 -- [ 0, 1, 2, ..., 98, 99 ] We would like to use this
+// We would like to use this set of numbers within 8 different threads simultaneously.
-// set of numbers within 8 different threads simultaneously. Each thread is
+// Each thread is going to get the sum of every eighth value, with an offset.
 // going to get the sum of every eighth value, with an offset.
 //
 // The first thread (offset 0), will sum 0, 8, 16, ...
 // The second thread (offset 1), will sum 1, 9, 17, ...
 // The third thread (offset 2), will sum 2, 10, 18, ...
 // ...
 // The eighth thread (offset 7), will sum 7, 15, 23, ...
-//
+
 // Because we are using threads, our values need to be thread-safe.  Therefore,
 // we are using Arc.  We need to make a change in each of the two TODOs.
-//
+
 // Make this code compile by filling in a value for `shared_numbers` where the
 // first TODO comment is, and create an initial binding for `child_numbers`
-// where the second TODO comment is. Try not to create any copies of the
+// where the second TODO comment is. Try not to create any copies of the `numbers` Vec!
 // `numbers` Vec!
 //
 // Execute `rustlings hint arc1` or use the `hint` watch subcommand for a hint.
 // I AM NOT DONE
--- a/exercises/smart_pointers/box1.rs
+++ b/exercises/smart_pointers/box1.rs
@ -1,15 +1,13 @@
 // box1.rs
 //
-// At compile time, Rust needs to know how much space a type takes up. This
+// At compile time, Rust needs to know how much space a type takes up. This becomes problematic
-// becomes problematic for recursive types, where a value can have as part of
+// for recursive types, where a value can have as part of itself another value of the same type.
-// itself another value of the same type. To get around the issue, we can use a
+// To get around the issue, we can use a `Box` - a smart pointer used to store data on the heap,
-// `Box` - a smart pointer used to store data on the heap, which also allows us
+// which also allows us to wrap a recursive type.
 // to wrap a recursive type.
 //
-// The recursive type we're implementing in this exercise is the `cons list` - a
+// The recursive type we're implementing in this exercise is the `cons list` - a data structure
-// data structure frequently found in functional programming languages. Each
+// frequently found in functional programming languages. Each item in a cons list contains two
-// item in a cons list contains two elements: the value of the current item and
+// elements: the value of the current item and the next item. The last item is a value called `Nil`.
 // 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 `todo!()`
--- a/exercises/smart_pointers/cow1.rs
+++ b/exercises/smart_pointers/cow1.rs
@ -1,16 +1,12 @@
 // cow1.rs
-//
+
-// This exercise explores the Cow, or Clone-On-Write type. Cow is a
+// This exercise explores the Cow, or Clone-On-Write type.
-// clone-on-write smart pointer. It can enclose and provide immutable access to
+// Cow is a clone-on-write smart pointer.
-// borrowed data, and clone the data lazily when mutation or ownership is
+// It can enclose and provide immutable access to borrowed data, and clone the data lazily when mutation or ownership is required.
-// required. The type is designed to work with general borrowed data via the
+// The type is designed to work with general borrowed data via the Borrow trait.
 // Borrow trait.
 //
 // This exercise is meant to show you what to expect when passing data to Cow.
-// Fix the unit tests by checking for Cow::Owned(_) and Cow::Borrowed(_) at the
+// Fix the unit tests by checking for Cow::Owned(_) and Cow::Borrowed(_) at the TODO markers.
 // TODO markers.
 //
 // Execute `rustlings hint cow1` or use the `hint` watch subcommand for a hint.
 // I AM NOT DONE
@ -54,9 +50,10 @@ mod tests {
    #[test]
    fn owned_no_mutation() -> Result<(), &'static str> {
-        // We can also pass `slice` without `&` so Cow owns it directly. In this
+        // We can also pass `slice` without `&` so Cow owns it directly.
-        // case no mutation occurs and thus also no clone, but the result is
+        // In this case no mutation occurs and thus also no clone,
-        // still owned because it was never borrowed or mutated.
+        // but the result is still owned because it was never borrowed
        // or mutated.
        let slice = vec![0, 1, 2];
        let mut input = Cow::from(slice);
        match abs_all(&mut input) {
@ -66,9 +63,9 @@ mod tests {
    #[test]
    fn owned_mutation() -> Result<(), &'static str> {
-        // Of course this is also the case if a mutation does occur. In this
+        // Of course this is also the case if a mutation does occur.
-        // case the call to `to_mut()` in the abs_all() function returns a
+        // In this case the call to `to_mut()` returns a reference to
-        // reference to the same data as before.
+        // the same data as before.
        let slice = vec![-1, 0, 1];
        let mut input = Cow::from(slice);
        match abs_all(&mut input) {
--- a/exercises/smart_pointers/rc1.rs
+++ b/exercises/smart_pointers/rc1.rs
@ -1,14 +1,9 @@
 // rc1.rs
-//
+// In this exercise, we want to express the concept of multiple owners via the Rc<T> type.
-// In this exercise, we want to express the concept of multiple owners via the
+// This is a model of our solar system - there is a Sun type and multiple Planets.
-// Rc<T> type. This is a model of our solar system - there is a Sun type and
+// The Planets take ownership of the sun, indicating that they revolve around the sun.
-// multiple Planets. The Planets take ownership of the sun, indicating that they
+
-// revolve around the sun.
+// Make this code compile by using the proper Rc primitives to express that the sun has multiple owners.
 //
 // Make this code compile by using the proper Rc primitives to express that the
 // sun has multiple owners.
 //
 // Execute `rustlings hint rc1` or use the `hint` watch subcommand for a hint.
 // I AM NOT DONE
@ -35,7 +30,6 @@ impl Planet {
    }
 }
 #[test]
 fn main() {
    let sun = Rc::new(Sun {});
    println!("reference count = {}", Rc::strong_count(&sun)); // 1 reference
--- a/exercises/strings/strings1.rs
+++ b/exercises/strings/strings1.rs
@ -1,9 +1,6 @@
 // strings1.rs
 //
 // Make me compile without changing the function signature!
-//
+// Execute `rustlings hint strings1` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint strings1` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/strings/strings2.rs
+++ b/exercises/strings/strings2.rs
@ -1,9 +1,6 @@
 // strings2.rs
 //
 // Make me compile without changing the function signature!
-//
+// Execute `rustlings hint strings2` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint strings2` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/strings/strings3.rs
+++ b/exercises/strings/strings3.rs
@ -1,7 +1,5 @@
 // strings3.rs
-//
+// Execute `rustlings hint strings3` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint strings3` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/strings/strings4.rs
+++ b/exercises/strings/strings4.rs
@ -1,10 +1,9 @@
 // strings4.rs
-//
+
 // 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!
 //
 // No hints this time!
 // I AM NOT DONE
--- a/exercises/structs/structs1.rs
+++ b/exercises/structs/structs1.rs
@ -1,9 +1,6 @@
 // structs1.rs
 //
 // Address all the TODOs to make the tests pass!
-//
+// Execute `rustlings hint structs1` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint structs1` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/structs/structs2.rs
+++ b/exercises/structs/structs2.rs
@ -1,9 +1,6 @@
 // structs2.rs
 //
 // Address all the TODOs to make the tests pass!
-//
+// Execute `rustlings hint structs2` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint structs2` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/structs/structs3.rs
+++ b/exercises/structs/structs3.rs
@ -1,11 +1,8 @@
 // structs3.rs
 //
 // Structs contain data, but 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!
-//
+// Execute `rustlings hint structs3` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint structs3` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
@ -13,15 +10,13 @@
 struct Package {
    sender_country: String,
    recipient_country: String,
-    weight_in_grams: u32,
+    weight_in_grams: i32,
 }
 impl Package {
-    fn new(sender_country: String, recipient_country: String, weight_in_grams: u32) -> Package {
+    fn new(sender_country: String, recipient_country: String, weight_in_grams: i32) -> Package {
-        if weight_in_grams < 10 {
+        if weight_in_grams <= 0 {
-            // This is not how you should handle errors in Rust,
+            panic!("Can not ship a weightless package.")
            // but we will learn about error handling later.
            panic!("Can not ship a package with weight below 10 grams.")
        } else {
            Package {
                sender_country,
@ -35,7 +30,7 @@ impl Package {
        // Something goes here...
    }
-    fn get_fees(&self, cents_per_gram: u32) -> ??? {
+    fn get_fees(&self, cents_per_gram: i32) -> ??? {
        // Something goes here...
    }
 }
@ -50,7 +45,7 @@ mod tests {
        let sender_country = String::from("Spain");
        let recipient_country = String::from("Austria");
-        Package::new(sender_country, recipient_country, 5);
+        Package::new(sender_country, recipient_country, -2210);
    }
    #[test]
--- a/exercises/tests/tests1.rs
+++ b/exercises/tests/tests1.rs
@ -1,14 +1,11 @@
 // tests1.rs
-//
+// Tests are important to ensure that your code does what you think it should do.
-// Tests are important to ensure that your code does what you think it should
+// Tests can be run on this file with the following command:
-// do. Tests can be run on this file with the following command: rustlings run
+// rustlings run tests1
-// tests1
+
-//
+// This test has a problem with it -- make the test compile! Make the test
-// This test has a problem with it -- make the test compile! Make the test pass!
+// pass! Make the test fail!
-// Make the test fail!
+// Execute `rustlings hint tests1` or use the `hint` watch subcommand for a hint.
 //
 // Execute `rustlings hint tests1` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/tests/tests2.rs
+++ b/exercises/tests/tests2.rs
@ -1,10 +1,7 @@
 // tests2.rs
-//
+// This test has a problem with it -- make the test compile! Make the test
-// This test has a problem with it -- make the test compile! Make the test pass!
+// pass! Make the test fail!
-// Make the test fail!
+// Execute `rustlings hint tests2` or use the `hint` watch subcommand for a hint.
 //
 // Execute `rustlings hint tests2` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/tests/tests3.rs
+++ b/exercises/tests/tests3.rs
@ -1,11 +1,8 @@
 // tests3.rs
 //
 // This test isn't testing our function -- make it do that in such a way that
-// the test passes. Then write a second test that tests whether we get the
+// the test passes. Then write a second test that tests whether we get the result
-// result we expect to get when we call `is_even(5)`.
+// we expect to get when we call `is_even(5)`.
-//
+// Execute `rustlings hint tests3` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint tests3` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/tests/tests4.rs
+++ b/exercises/tests/tests4.rs
@ -1,9 +1,6 @@
 // tests4.rs
 //
 // Make sure that we're testing for the correct conditions!
-//
+// Execute `rustlings hint tests4` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint tests4` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/threads/README.md
+++ b/exercises/threads/README.md
@ -1,6 +1,6 @@
 # Threads
-In most current operating systems, an executed program's code is run in a process, and the operating system manages multiple processes at once.
+In most current operating systems, an executed program’s code is run in a process, and the operating system manages multiple processes at once.
 Within your program, you can also have independent parts that run simultaneously. The features that run these independent parts are called threads.
 ## Further information
--- a/exercises/threads/threads1.rs
+++ b/exercises/threads/threads1.rs
@ -1,12 +1,10 @@
 // threads1.rs
-//
+// Execute `rustlings hint threads1` or use the `hint` watch subcommand for a hint.
-// This program spawns multiple threads that each run for at least 250ms, and
+
-// each thread returns how much time they took to complete. The program should
+// This program spawns multiple threads that each run for at least 250ms,
-// wait until all the spawned threads have finished and should collect their
+// and each thread returns how much time they took to complete.
-// return values into a vector.
+// The program should wait until all the spawned threads have finished and
-//
+// should collect their return values into a vector.
 // Execute `rustlings hint threads1` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/threads/threads2.rs
+++ b/exercises/threads/threads2.rs
@ -1,11 +1,7 @@
 // threads2.rs
-//
+// Execute `rustlings hint threads2` or use the `hint` watch subcommand for a hint.
-// Building on the last exercise, we want all of the threads to complete their
+// Building on the last exercise, we want all of the threads to complete their work but this time
-// work but this time the spawned threads need to be in charge of updating a
+// the spawned threads need to be in charge of updating a shared value: JobStatus.jobs_completed
 // shared value: JobStatus.jobs_completed
 //
 // Execute `rustlings hint threads2` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
@ -31,9 +27,8 @@ fn main() {
    }
    for handle in handles {
        handle.join().unwrap();
-        // TODO: Print the value of the JobStatus.jobs_completed. Did you notice
+        // TODO: Print the value of the JobStatus.jobs_completed. Did you notice anything
-        // anything interesting in the output? Do you have to 'join' on all the
+        // interesting in the output? Do you have to 'join' on all the handles?
        // handles?
        println!("jobs completed {}", ???);
    }
 }
--- a/exercises/threads/threads3.rs
+++ b/exercises/threads/threads3.rs
@ -1,7 +1,5 @@
 // threads3.rs
-//
+// Execute `rustlings hint threads3` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint threads3` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
@ -48,7 +46,6 @@ fn send_tx(q: Queue, tx: mpsc::Sender<u32>) -> () {
    });
 }
 #[test]
 fn main() {
    let (tx, rx) = mpsc::channel();
    let queue = Queue::new();
--- a/exercises/traits/traits1.rs
+++ b/exercises/traits/traits1.rs
@ -1,11 +1,13 @@
 // traits1.rs
 // Time to implement some traits!
 //
-// Time to implement some traits! Your task is to implement the trait
+// Your task is to implement the trait
-// `AppendBar` for the type `String`. The trait AppendBar has only one function,
+// `AppendBar` for the type `String`.
 // which appends "Bar" to any object implementing this trait.
 //
-// Execute `rustlings hint traits1` or use the `hint` watch subcommand for a
+// The trait AppendBar has only one function,
-// hint.
+// which appends "Bar" to any object
 // implementing this trait.
 // Execute `rustlings hint traits1` or use the `hint` watch subcommand for a hint.
 // I AM NOT DONE
--- a/exercises/traits/traits2.rs
+++ b/exercises/traits/traits2.rs
@ -1,11 +1,14 @@
 // traits2.rs
 //
-// Your task is to implement the trait `AppendBar` for a vector of strings. To
+// Your task is to implement the trait
-// implement this trait, consider for a moment what it means to 'append "Bar"'
+// `AppendBar` for a vector of strings.
 //
 // To implement this trait, consider for
 // a moment what it means to 'append "Bar"'
 // to a vector of strings.
 //
-// No boiler plate code this time, you can do this!
+// No boiler plate code this time,
-//
+// you can do this!
 // Execute `rustlings hint traits2` or use the `hint` watch subcommand for a hint.
 // I AM NOT DONE
--- a/exercises/traits/traits3.rs
+++ b/exercises/traits/traits3.rs
@ -1,12 +1,11 @@
 // traits3.rs
 //
-// Your task is to implement the Licensed trait for both structures and have
+// Your task is to implement the Licensed trait for
-// them return the same information without writing the same function twice.
+// both structures and have them return the same
 // information without writing the same function twice.
 //
 // Consider what you can add to the Licensed trait.
-//
+// Execute `rustlings hint traits3` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint traits3` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/traits/traits4.rs
+++ b/exercises/traits/traits4.rs
@ -1,11 +1,8 @@
 // traits4.rs
 //
 // Your task is to replace the '??' sections so the code compiles.
 //
 // Don't change any line other than the marked one.
-//
+// Execute `rustlings hint traits4` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint traits4` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/exercises/traits/traits5.rs
+++ b/exercises/traits/traits5.rs
@ -1,11 +1,8 @@
 // traits5.rs
 //
 // Your task is to replace the '??' sections so the code compiles.
 //
 // Don't change any line other than the marked one.
-//
+// Execute `rustlings hint traits5` or use the `hint` watch subcommand for a hint.
 // Execute `rustlings hint traits5` or use the `hint` watch subcommand for a
 // hint.
 // I AM NOT DONE
--- a/Show More
+++ b/Show More