.cargo/config.toml

@@ -1,2 +0,0 @@
-[alias]
-dev = ["run", "--", "dev"]

.editorconfig

@@ -0,0 +1,7 @@
+root = true
+
+[*.rs]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4

.github/workflows/rust.yml

@@ -1,16 +1,10 @@
-name: Check
+name: Rustlings Tests
 
 on:
   push:
     branches: [main]
-    paths-ignore:
-      - website
-      - '*.md'
   pull_request:
     branches: [main]
-    paths-ignore:
-      - website
-      - '*.md'
 
 env:
   CARGO_TERM_COLOR: always
@@ -20,28 +14,30 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Clippy
-        run: cargo clippy -- --deny warnings
+      - run: cargo clippy -- --deny warnings
   fmt:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: rustfmt
+      - uses: DavidAnson/markdownlint-cli2-action@v16
+        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]
+        os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
       - uses: actions/checkout@v4
       - uses: swatinem/rust-cache@v2
-      - name: cargo test
+      - name: Run cargo test
         run: cargo test --workspace
   dev-check:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: swatinem/rust-cache@v2
-      - name: rustlings dev check
-        run: cargo dev check --require-solutions
+      - name: Run rustlings dev check
+        run: cargo run -- dev check --require-solutions

.github/workflows/web.yml

@@ -0,0 +1,87 @@
+# 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@v4
+        with:
+          fetch-depth: 0
+      - 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

.github/workflows/website.yml

@@ -1,43 +0,0 @@
-name: Website
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [main]
-    paths: [website]
-
-jobs:
-  build:
-    defaults:
-      run:
-        working-directory: website
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install TailwindCSS
-        run: npm install
-      - name: Build CSS
-        run: npx @tailwindcss/cli -m -i input.css -o static/main.css
-      - name: Download Zola
-        run: curl -fsSL https://github.com/getzola/zola/releases/download/v0.20.0/zola-v0.20.0-x86_64-unknown-linux-gnu.tar.gz | tar xz
-      - name: Build site
-        run: ./zola build
-      - name: Upload static files as artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: website/public/
-
-  deploy:
-    needs: build
-    # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
-    permissions:
-      pages: write    # to deploy to Pages
-      id-token: write # to verify the deployment originates from an appropriate source
-    # Deploy to the github-pages environment
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Deploy to GitHub Pages
-        uses: actions/deploy-pages@v4

.gitignore

@@ -6,6 +6,10 @@ Cargo.lock
 # State file
 .rustlings-state.txt
 
+# oranda
+public/
+.netlify
+
 # OS
 .DS_Store
 .direnv/

.markdownlint.yml

@@ -0,0 +1,2 @@
+# MD013/line-length Line length, Expected: 80
+MD013: false

.typos.toml

@@ -1,6 +1,3 @@
-[default.extend-words]
-"earch" = "earch" # Because of <s>earch in the list footer
-
 [files]
 extend-exclude = [
   "CHANGELOG.md",

CHANGELOG.md

@@ -1,56 +1,4 @@
-## Unreleased
-
-### Changed
-
-- `vecs2`: Removed the use of `map` and `collect`, which are only taught later.
-
-## 6.5.0 (2025-08-21)
-
-### Added
-
-- Check that Clippy is installed before initialization
-
-### Changed
-
-- Upgrade to Rust edition 2024
-- Raise the minimum supported Rust version to `1.88`
-- Don't follow symlinks in the file watcher
-- `dev new`: Don't add `.rustlings-state.txt` to `.gitignore`
-
-### Fixed
-
-- Fix file links in VS Code
-- Fix error printing when the progress bar is shown
-- `dev check`: Don't check formatting if there are no solution files
-
-## 6.4.0 (2024-11-11)
-
-### Added
-
-- The list of exercises is now searchable by pressing `s` or `/` 🔍️ (thanks to [@frroossst](https://github.com/frroossst))
-- New option `c` in the prompt to manually check all exercises ✅ (thanks to [@Nahor](https://github.com/Nahor))
-- New command `check-all` to manually check all exercises ✅ (thanks to [@Nahor](https://github.com/Nahor))
-- Addictive animation for showing the progress of checking all exercises. A nice showcase of parallelism in Rust ✨
-- New option `x` in the prompt to reset the file of the current exercise 🔄
-- Allow `dead_code` for all exercises and solutions ⚰️ (thanks to [@huss4in](https://github.com/huss4in))
-- Pause input while running an exercise to avoid unexpected prompt interactions ⏸️
-- Limit the maximum number of exercises to 999. Any community exercises willing to reach that limit? 🔝
-
-### Changed
-
-- `enums3`: Remove redundant enum definition task (thanks to [@senekor](https://github.com/senekor))
-- `if2`: Make the exercise less confusing by avoiding "fizz", "fuzz", "foo", "bar" and "baz" (thanks to [@senekor](https://github.com/senekor))
-- `hashmap3`: Use the method `Entry::or_default`.
-- Update the state of all exercises when checking all of them (thanks to [@Nahor](https://github.com/Nahor))
-- The main prompt doesn't need a confirmation with ENTER on Unix-like systems anymore.
-- No more jumping back to a previous exercise when its file is changed. Use the list to jump between exercises.
-- Dump the solution file after an exercise is done even if the solution's directory doesn't exist.
-- Rework the footer in the list.
-- Optimize the file watcher.
-
-### Fixed
-
-- Fix bad contrast in the list on terminals with a light theme.
+<a name="6.3.0"></a>
 
 ## 6.3.0 (2024-08-29)
 
@@ -91,6 +39,8 @@
 - Fix the list when the terminal height is too low.
 - Restore the terminal after an error in the list.
 
+<a name="6.2.0"></a>
+
 ## 6.2.0 (2024-08-09)
 
 ### Added
@@ -107,11 +57,13 @@
 - Run the final check of all exercises in parallel.
 - Small exercise improvements.
 
+<a name="6.1.0"></a>
+
 ## 6.1.0 (2024-07-10)
 
 #### Added
 
-- `dev check`: Check that all exercises (including community ones) include at least one `TODO` comment.
+- `dev check`: Check that all exercises (including third-party ones) include at least one `TODO` comment.
 - `dev check`: Check that all exercises actually fail to run (not already solved).
 
 #### Changed
@@ -124,11 +76,15 @@
 - Exit with a helpful error message on missing/unsupported terminal/TTY.
 - Mark the last exercise as done.
 
+<a name="6.0.1"></a>
+
 ## 6.0.1 (2024-07-04)
 
 Small exercise improvements and fixes.
 Most importantly, fixed that the exercise `clippy1` was already solved 😅
 
+<a name="6.0.0"></a>
+
 ## 6.0.0 (2024-07-03)
 
 This release is the result of a complete rewrite to deliver a ton of new features and improvements ✨
@@ -157,7 +113,7 @@ You can read about the motivations of this change in [this issue](https://github
 
 ### List mode
 
-A new list mode was added!
+A list mode was added using [Ratatui](https://ratatui.rs).
 You can enter it by entering `l` in the watch mode.
 It offers the following features:
 
@@ -186,13 +142,15 @@ This should avoid issues related to the language server or to running exercises,
 Clippy lints are now shown on all exercises, not only the Clippy exercises 📎
 Make Clippy your friend from early on 🥰
 
-### Community Exercises
+### Third-party exercises
 
-Rustlings now supports community exercises!
+Rustlings now supports third-party exercises!
 
 Do you want to create your own set of Rustlings exercises to focus on some specific topic?
 Or do you want to translate the original Rustlings exercises?
-Then follow the link to the guide about [community exercises](https://rustlings.rust-lang.org/community-exercises)!
+Then follow the link to the guide about [third-party exercises](THIRD_PARTY_EXERCISES.md)!
+
+<a name="5.6.1"></a>
 
 ## 5.6.1 (2023-09-18)
 
@@ -209,6 +167,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - `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
@@ -248,12 +208,16 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - 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
@@ -288,6 +252,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - 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)
 
 #### Changed
@@ -303,6 +269,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - `macros4`: Prevented auto-fix by adding `#[rustfmt::skip]`
 - `cli`: Actually show correct progress percentages
 
+<a name="5.4.0"></a>
+
 ## 5.4.0 (2023-02-12)
 
 #### Changed
@@ -331,6 +299,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 
 - Bumped min Rust version to 1.58 in installation script
 
+<a name="5.3.0"></a>
+
 ## 5.3.0 (2022-12-23)
 
 #### Added
@@ -363,6 +333,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - Applied some Clippy and rustfmt formatting
 - Added a note on Windows PowerShell and other shell compatibility
 
+<a name="5.2.1"></a>
+
 ## 5.2.1 (2022-09-06)
 
 #### Fixed
@@ -376,6 +348,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 
 - Fixed a typo in README.md
 
+<a name="5.2.0"></a>
+
 ## 5.2.0 (2022-08-27)
 
 #### Added
@@ -392,12 +366,16 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - **quiz1**: Adjusted the explanations to be consistent with
   the tests
 
+<a name="5.1.1"></a>
+
 ## 5.1.1 (2022-08-17)
 
 #### Bug Fixes
 
 - Fixed an incorrect assertion in options1
 
+<a name="5.1.0"></a>
+
 ## 5.1.0 (2022-08-16)
 
 #### Features
@@ -432,6 +410,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - Clarified manual installation instructions using `cargo install --path .`
 - Added a link to our Zulip in the readme file
 
+<a name="5.0.0"></a>
+
 ## 5.0.0 (2022-07-16)
 
 #### Features
@@ -504,6 +484,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - Updated spacing in Cargo.toml.
 - Added a GitHub actions config so that tests run on every PR/commit.
 
+<a name="4.8.0"></a>
+
 ## 4.8.0 (2022-07-01)
 
 #### Features
@@ -524,6 +506,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - Replaced the git.io URL with the fully qualified URL because of git.io's sunsetting.
 - Removed the deprecated Rust GitPod extension.
 
+<a name="4.7.1"></a>
+
 ## 4.7.1 (2022-04-20)
 
 #### Features
@@ -544,6 +528,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - The changelog will now be manually written instead of being automatically generated by the
   Git log.
 
+<a name="4.7.0"></a>
+
 ## 4.7.0 (2022-04-14)
 
 #### Features
@@ -584,6 +570,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - Add hints on how to get GCC installed (#741) ([bc56861](https://github.com/rust-lang/rustlings/commit/bc5686174463ad6f4f6b824b0e9b97c3039d4886))
 - Fix some code blocks that were not highlighted ([17f9d74](https://github.com/rust-lang/rustlings/commit/17f9d7429ccd133a72e815fb5618e0ce79560929))
 
+<a name="4.6.0"></a>
+
 ## 4.6.0 (2021-09-25)
 
 #### Features
@@ -606,6 +594,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
   - Clarify instructions ([df25684c](https://github.com/rust-lang/rustlings/commit/df25684cb79f8413915e00b5efef29369849cef1))
 - **quiz1:** Fix inconsistent wording (#826) ([03131a3d](https://github.com/rust-lang/rustlings/commit/03131a3d35d9842598150f9da817f7cc26e2669a))
 
+<a name="4.5.0"></a>
+
 ## 4.5.0 (2021-07-07)
 
 #### Features
@@ -626,6 +616,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - **try_from_into, from_str:** hints for dyn Error ([11d2cf0d](https://github.com/rust-lang/rustlings/commit/11d2cf0d604dee3f5023c17802d69438e69fa50e))
 - **variables5:** confine the answer further ([48ffcbd2](https://github.com/rust-lang/rustlings/commit/48ffcbd2c4cc4d936c2c7480019190f179813cc5))
 
+<a name="4.4.0"></a>
+
 ## 4.4.0 (2021-04-24)
 
 #### Bug Fixes
@@ -667,6 +659,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
   - updated progress percentage ([1c6f7e4b](https://github.com/rust-lang/rustlings/commit/1c6f7e4b7b9b3bd36f4da2bb2b69c549cc8bd913))
   - added progress info ([c0e3daac](https://github.com/rust-lang/rustlings/commit/c0e3daacaf6850811df5bc57fa43e0f249d5cfa4))
 
+<a name="4.3.0"></a>
+
 ## 4.3.0 (2020-12-29)
 
 #### Features
@@ -689,6 +683,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
   - Update description (#584) ([96347df9](https://github.com/rust-lang/rustlings/commit/96347df9df294f01153b29d9ad4ba361f665c755))
 - **vec1:** Have test compare every element in a and v ([9b6c6293](https://github.com/rust-lang/rustlings/commit/9b6c629397b24b944f484f5b2bbd8144266b5695))
 
+<a name="4.2.0"></a>
+
 ## 4.2.0 (2020-11-07)
 
 #### Features
@@ -709,6 +705,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
   - missing comma in test ([4fb230da](https://github.com/rust-lang/rustlings/commit/4fb230daf1251444fcf29e085cee222a91f8a37e))
 - **quiz3:** Second test is for odd numbers, not even. (#553) ([18e0bfef](https://github.com/rust-lang/rustlings/commit/18e0bfef1de53071e353ba1ec5837002ff7290e6))
 
+<a name="4.1.0"></a>
+
 ## 4.1.0 (2020-10-05)
 
 #### Bug Fixes
@@ -731,6 +729,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - **cli:** Added 'cls' command to 'watch' mode (#474) ([4f2468e1](https://github.com/rust-lang/rustlings/commit/4f2468e14f574a93a2e9b688367b5752ed96ae7b))
 - **try_from_into:** Add insufficient length test (#469) ([523d18b8](https://github.com/rust-lang/rustlings/commit/523d18b873a319f7c09262f44bd40e2fab1830e5))
 
+<a name="4.0.0"></a>
+
 ## 4.0.0 (2020-07-08)
 
 #### Breaking Changes
@@ -772,6 +772,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - **test2:** name of type String and &str (#394) ([d6c0a688](https://github.com/rust-lang/rustlings/commit/d6c0a688e6a96f93ad60d540d4b326f342fc0d45))
 - **variables6:** minor typo (#419) ([524e17df](https://github.com/rust-lang/rustlings/commit/524e17df10db95f7b90a0f75cc8997182a8a4094))
 
+<a name="3.0.0"></a>
+
 ## 3.0.0 (2020-04-11)
 
 #### Breaking Changes
@@ -794,6 +796,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - add new exercises for generics (#280) ([76be5e4e](https://github.com/rust-lang/rustlings/commit/76be5e4e991160f5fd9093f03ee2ba260e8f7229))
 - **ci:** add buildkite config ([b049fa2c](https://github.com/rust-lang/rustlings/commit/b049fa2c84dba0f0c8906ac44e28fd45fba51a71))
 
+<a name="2.2.1"></a>
+
 ### 2.2.1 (2020-02-27)
 
 #### Bug Fixes
@@ -804,11 +808,13 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 
 - Add clippy lints (#269) ([1e2fd9c9](https://github.com/rust-lang/rustlings/commit/1e2fd9c92f8cd6e389525ca1a999fca4c90b5921))
 
+<a name="2.2.0"></a>
+
 ## 2.2.0 (2020-02-25)
 
 #### Bug Fixes
 
-- Update deps to version compatible with aarch64-pc-windows (#263) ([19a93428](https://github.com/rust-lang/rustlings/commit/19a93428b3c73d994292671f829bdc8e5b7b3401))
+- Update deps to version compatable with aarch64-pc-windows (#263) ([19a93428](https://github.com/rust-lang/rustlings/commit/19a93428b3c73d994292671f829bdc8e5b7b3401))
 - **docs:**
   - Added a necessary step to Windows installation process (#242) ([3906efcd](https://github.com/rust-lang/rustlings/commit/3906efcd52a004047b460ed548037093de3f523f))
   - Fixed mangled sentence from book; edited for clarity (#266) ([ade52ff](https://github.com/rust-lang/rustlings/commit/ade52ffb739987287ddd5705944c8777705faed9))
@@ -831,6 +837,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - Added traits exercises (#274 but specifically #216, which originally added
   this :heart:) ([b559cdd](https://github.com/rust-lang/rustlings/commit/b559cdd73f32c0d0cfc1feda39f82b3e3583df17))
 
+<a name="2.1.0"></a>
+
 ## 2.1.0 (2019-11-27)
 
 #### Bug Fixes
@@ -848,6 +856,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 
 - **watch:** show hint while watching ([8143d57b](https://github.com/rust-lang/rustlings/commit/8143d57b4e88c51341dd4a18a14c536042cc009c))
 
+<a name="2.0.0"></a>
+
 ## 2.0.0 (2019-11-12)
 
 #### Bug Fixes
@@ -868,6 +878,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - **cli:** check for rustc before doing anything ([36a033b8](https://github.com/rust-lang/rustlings/commit/36a033b87a6549c1e5639c908bf7381c84f4f425))
 - **hint:** Add test for hint ([ce9fa6eb](https://github.com/rust-lang/rustlings/commit/ce9fa6ebbfdc3e7585d488d9409797285708316f))
 
+<a name="1.5.1"></a>
+
 ### 1.5.1 (2019-11-11)
 
 #### Bug Fixes
@@ -879,6 +891,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - **threads:** Move Threads behind SLT ([fbe91a67](https://github.com/rust-lang/rustlings/commit/fbe91a67a482bfe64cbcdd58d06ba830a0f39da3), closes [#205](https://github.com/rust-lang/rustlings/issues/205))
 - **watch:** clear screen before each `verify()` ([3aff590](https://github.com/rust-lang/rustlings/commit/3aff59085586c24196a547c2693adbdcf4432648))
 
+<a name="1.5.0"></a>
+
 ## 1.5.0 (2019-11-09)
 
 #### Bug Fixes
@@ -903,6 +917,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - Added exercise for struct update syntax ([1c4c8764](https://github.com/rust-lang/rustlings/commit/1c4c8764ed118740cd4cee73272ddc6cceb9d959))
 - **iterators2:** adds iterators2 exercise including config ([9288fccf](https://github.com/rust-lang/rustlings/commit/9288fccf07a2c5043b76d0fd6491e4cf72d76031))
 
+<a name="1.4.1"></a>
+
 ### 1.4.1 (2019-08-13)
 
 #### Bug Fixes
@@ -911,6 +927,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - **option1:** Add test for prematurely passing exercise ([a750e4a1](https://github.com/rust-lang/rustlings/commit/a750e4a1a3006227292bb17d57d78ce84da6bfc6))
 - **test1:** Swap assertion parameter order ([4086d463](https://github.com/rust-lang/rustlings/commit/4086d463a981e81d97781851d17db2ced290f446))
 
+<a name="1.4.0"></a>
+
 ## 1.4.0 (2019-07-13)
 
 #### Bug Fixes
@@ -927,6 +945,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - **changelog:** Use clog for changelogs ([34e31232](https://github.com/rust-lang/rustlings/commit/34e31232dfddde284a341c9609b33cd27d9d5724))
 - **iterators2:** adds iterators2 exercise including config ([9288fccf](https://github.com/rust-lang/rustlings/commit/9288fccf07a2c5043b76d0fd6491e4cf72d76031))
 
+<a name="1.3.0"></a>
+
 ### 1.3.0 (2019-06-05)
 
 #### Features
@@ -942,12 +962,16 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - Fix broken link (#164, @HanKruiger)
 - Remove highlighting and syntect (#167, @komaeda)
 
+<a name="1.2.2"></a>
+
 ### 1.2.2 (2019-05-07)
 
 #### Bug Fixes
 
 - Reverted `--nocapture` flag since it was causing tests to pass unconditionally
 
+<a name="1.2.1"></a>
+
 ### 1.2.1 (2019-04-22)
 
 #### Bug Fixes
@@ -955,6 +979,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - Fix the `--nocapture` feature (@komaeda)
 - Provide a nicer error message for when you're in the wrong directory
 
+<a name="1.2.0"></a>
+
 ### 1.2.0 (2019-04-22)
 
 #### Features
@@ -962,6 +988,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - Add errors to exercises that compile without user changes (@yvan-sraka)
 - Use --nocapture when testing, enabling `println!` when running (@komaeda)
 
+<a name="1.1.1"></a>
+
 ### 1.1.1 (2019-04-14)
 
 #### Bug fixes
@@ -974,6 +1002,8 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - Fix links by deleting book version (@diodfr, #142)
 - Canonicalize paths to fix path matching (@cjpearce, #143)
 
+<a name="1.1.0"></a>
+
 ### 1.1.0 (2019-03-20)
 
 - errors2.rs: update link to Rust book (#124)
@@ -983,12 +1013,16 @@ Then follow the link to the guide about [community exercises](https://rustlings.
 - Give a warning when Rustlings isn't run from the right directory (#123)
 - Verify that rust version is recent enough to install Rustlings (#131)
 
+<a name="1.0.1"></a>
+
 ### 1.0.1 (2019-03-06)
 
 - Adds a way to install Rustlings in one command (`curl -L https://git.io/rustlings | bash`)
 - Makes `rustlings watch` react to create file events (@shaunbennett, #117)
 - Reworks the exercise management to use an external TOML file instead of just listing them in the code
 
+<a name="1.0.0"></a>
+
 ### 1.0.0 (2019-03-06)
 
 Initial release.

Cargo.toml

@@ -1,11 +1,12 @@
 [workspace]
+resolver = "2"
 exclude = [
   "tests/test_exercises",
   "dev",
 ]
 
 [workspace.package]
-version = "6.5.0"
+version = "6.3.0"
 authors = [
   "Mo Bitar <mo8it@proton.me>", # https://github.com/mo8it
   "Liv <mokou@fastmail.com>", # https://github.com/shadows-withal
@@ -14,12 +15,12 @@ authors = [
 ]
 repository = "https://github.com/rust-lang/rustlings"
 license = "MIT"
-edition = "2024" # On Update: Update the edition of `rustfmt` in `dev check` and `CARGO_TOML` in `dev new`.
-rust-version = "1.88"
+edition = "2021" # On Update: Update the edition of the `rustfmt` command that checks the solutions.
+rust-version = "1.80"
 
 [workspace.dependencies]
-serde = { version = "1.0", features = ["derive"] }
-toml = { version = "0.9", default-features = false, features = ["std", "parse", "serde"] }
+serde = { version = "1.0.209", features = ["derive"] }
+toml_edit = { version = "0.22.20", default-features = false, features = ["parse", "serde"] }
 
 [package]
 name = "rustlings"
@@ -45,20 +46,19 @@ include = [
 ]
 
 [dependencies]
-anyhow = "1.0"
-clap = { version = "4.5", features = ["derive"] }
-crossterm = { version = "0.29", default-features = false, features = ["windows", "events"] }
-notify = "8.0"
-rustlings-macros = { path = "rustlings-macros", version = "=6.5.0" }
-serde_json = "1.0"
+ahash = { version = "0.8.11", default-features = false }
+anyhow = "1.0.86"
+clap = { version = "4.5.16", features = ["derive"] }
+crossterm = { version = "0.28.1", default-features = false, features = ["windows", "events"] }
+notify-debouncer-mini = { version = "0.4.1", default-features = false }
+os_pipe = "1.2.1"
+rustlings-macros = { path = "rustlings-macros", version = "=6.3.0" }
+serde_json = "1.0.127"
 serde.workspace = true
-toml.workspace = true
-
-[target.'cfg(not(windows))'.dependencies]
-rustix = { version = "1.0", default-features = false, features = ["std", "stdio", "termios"] }
+toml_edit.workspace = true
 
 [dev-dependencies]
-tempfile = "3.21"
+tempfile = "3.12.0"
 
 [profile.release]
 panic = "abort"
@@ -68,7 +68,6 @@ panic = "abort"
 
 [package.metadata.release]
 pre-release-hook = ["./release-hook.sh"]
-pre-release-commit-message = "Release 🎉"
 
 [workspace.lints.rust]
 unsafe_code = "forbid"
@@ -82,6 +81,8 @@ infinite_loop = "deny"
 mem_forget = "deny"
 dbg_macro = "warn"
 todo = "warn"
+# TODO: Remove after the following fix is released: https://github.com/rust-lang/rust-clippy/pull/13102
+needless_option_as_deref = "allow"
 
 [lints]
 workspace = true

README.md

@@ -1,7 +1,156 @@
-# [Rustlings](https://rustlings.rust-lang.org) 🦀
+<div class="oranda-hide">
 
-Small exercises to get you used to reading and writing [Rust](https://www.rust-lang.org) code - _Recommended in parallel to reading [the official Rust book](https://doc.rust-lang.org/book) 📚️_
+# Rustlings 🦀❤️
 
-Visit the **website** for a demo, info about setup and more:
+</div>
 
-## ➡️ [rustlings.rust-lang.org](https://rustlings.rust-lang.org) ⬅️
+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!
+
+It is recommended to do the Rustlings exercises in parallel to reading [the official Rust book](https://doc.rust-lang.org/book/), the most comprehensive resource for learning Rust 📚️
+
+[Rust By Example](https://doc.rust-lang.org/rust-by-example/) is another recommended resource that you might find helpful.
+It contains code examples and exercises similar to Rustlings, but online.
+
+## Getting Started
+
+### Installing Rust
+
+Before installing Rustlings, you need to have the **latest version of Rust** installed.
+Visit [www.rust-lang.org/tools/install](https://www.rust-lang.org/tools/install) for further instructions on installing Rust.
+This will also install _Cargo_, Rust's package/project manager.
+
+> 🐧 If you're on Linux, make sure you've installed `gcc` (for a linker).
+>
+> Deb: `sudo apt install gcc`.
+> Dnf: `sudo dnf install gcc`.
+
+> 🍎 If you're on MacOS, make sure you've installed Xcode and its developer tools by running `xcode-select --install`.
+
+### Installing Rustlings
+
+The following command will download and compile Rustlings:
+
+```bash
+cargo install rustlings
+```
+
+<details>
+<summary><strong>If the installation fails…</strong> (<em>click to expand</em>)</summary>
+
+- Make sure you have the latest Rust version by running `rustup update`
+- Try adding the `--locked` flag: `cargo install rustlings --locked`
+- Otherwise, please [report the issue](https://github.com/rust-lang/rustlings/issues/new)
+
+</details>
+
+### Initialization
+
+After installing Rustlings, run the following command to initialize the `rustlings/` directory:
+
+```bash
+rustlings init
+```
+
+<details>
+<summary><strong>If the command <code>rustlings</code> can't be found…</strong> (<em>click to expand</em>)</summary>
+
+You are probably using Linux and installed Rust using your package manager.
+
+Cargo installs binaries to the directory `~/.cargo/bin`.
+Sadly, package managers often don't add `~/.cargo/bin` to your `PATH` environment variable.
+
+The solution is to …
+
+- either add `~/.cargo/bin` manually to `PATH`
+- or to uninstall Rust from the package manager and install it using the official way with `rustup`: https://www.rust-lang.org/tools/install
+
+</details>
+
+Now, go into the newly initialized directory and launch Rustlings for further instructions on getting started with the exercises:
+
+```bash
+cd rustlings/
+rustlings
+```
+
+## Working environment
+
+### Editor
+
+Our general recommendation is [VS Code](https://code.visualstudio.com/) with the [rust-analyzer plugin](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer).
+But any editor that supports [rust-analyzer](https://rust-analyzer.github.io/) should be enough for working on the exercises.
+
+### Terminal
+
+While working with Rustlings, please use a modern terminal for the best user experience.
+The default terminal on Linux and Mac should be sufficient.
+On Windows, we recommend the [Windows Terminal](https://aka.ms/terminal).
+
+## Doing exercises
+
+The exercises are sorted by topic and can be found in the subdirectory `exercises/<topic>`.
+For every topic, there is an additional `README.md` file with some resources to get you started on the topic.
+We highly recommend that you have a look at them before you start 📚️
+
+Most exercises contain an error that keeps them from compiling, and it's up to you to fix it!
+Some exercises contain tests that need to pass for the exercise to be done ✅
+
+Search for `TODO` and `todo!()` to find out what you need to change.
+Ask for hints by entering `h` in the _watch mode_ 💡
+
+### Watch Mode
+
+After [initialization](#initialization), Rustlings can be launched by simply running the command `rustlings`.
+
+This will start the _watch mode_ which walks you through the exercises in a predefined order (what we think is best for newcomers).
+It will rerun the current exercise automatically every time you change the exercise's file in the `exercises/` directory.
+
+<details>
+<summary><strong>If detecting file changes in the <code>exercises/</code> directory fails…</strong> (<em>click to expand</em>)</summary>
+
+> You can add the **`--manual-run`** flag (`rustlings --manual-run`) to manually rerun the current exercise by entering `r` in the watch mode.
+>
+> Please [report the issue](https://github.com/rust-lang/rustlings/issues/new) with some information about your operating system and whether you run Rustlings in a container or virtual machine (e.g. WSL).
+
+</details>
+
+### Exercise List
+
+In the [watch mode](#watch-mode) (after launching `rustlings`), you can enter `l` to open the interactive exercise list.
+
+The list allows you to…
+
+- See the status of all exercises (done or pending)
+- `c`: Continue at another exercise (temporarily skip some exercises or go back to a previous one)
+- `r`: Reset status and file of an exercise (you need to _reload/reopen_ its file in your editor afterwards)
+
+See the footer of the list for all possible keys.
+
+## Continuing On
+
+Once you've completed Rustlings, put your new knowledge to good use!
+Continue practicing your Rust skills by building your own projects, contributing to Rustlings, or finding other open-source projects to contribute to.
+
+## Third-Party Exercises
+
+Do you want to create your own set of Rustlings exercises to focus on some specific topic?
+Or do you want to translate the original Rustlings exercises?
+Then follow the link to the guide about [third-party exercises](https://github.com/rust-lang/rustlings/blob/main/THIRD_PARTY_EXERCISES.md)!
+
+## Uninstalling Rustlings
+
+If you want to remove Rustlings from your system, run the following command:
+
+```bash
+cargo uninstall rustlings
+```
+
+## Contributing
+
+See [CONTRIBUTING.md](https://github.com/rust-lang/rustlings/blob/main/CONTRIBUTING.md) 🔗
+
+## Contributors ✨
+
+Thanks to [all the wonderful contributors](https://github.com/rust-lang/rustlings/graphs/contributors) 🎉

THIRD_PARTY_EXERCISES.md

@@ -0,0 +1,53 @@
+# Third-Party Exercises
+
+The support of Rustlings for third-party exercises allows you to create your own set of Rustlings exercises to focus on some specific topic.
+You could also offer a translation of the original Rustlings exercises as third-party exercises.
+
+## Getting started
+
+To create third-party exercises, install Rustlings and run `rustlings dev new PROJECT_NAME`.
+This command will, similar to `cargo new PROJECT_NAME`, create a template directory called `PROJECT_NAME` with all what you need to get started.
+
+Read the comments in the generated `info.toml` file to understand its format.
+It allows you to set a custom welcome and final message and specify the metadata of every exercise.
+
+## Create an exercise
+
+Here is an example of the metadata of one file:
+
+```toml
+[[exercises]]
+name = "intro1"
+hint = """
+To finish this exercise, you need to …
+This link might help you …"""
+```
+
+After entering this in `info.toml`, create the file `intro1.rs` in the `exercises/` directory.
+The exercise needs to contain a `main` function, but it can be empty.
+Adding tests is recommended.
+Look at the official Rustlings exercises for inspiration.
+
+You can optionally add a solution file `intro1.rs` to the `solutions/` directory.
+
+Now, run `rustlings dev check`.
+It will tell you about any issues with your exercises.
+For example, it will tell you to run `rustlings dev update` to update the `Cargo.toml` file to include the new exercise `intro1`.
+
+`rustlings dev check` will also run your solutions (if you have any) to make sure that they run successfully.
+
+That's it!
+You finished your first exercise 🎉
+
+## Publish
+
+Now, add more exercises and publish them as a Git repository.
+
+Users just have to clone that repository and run `rustlings` in it to start working on your set of exercises just like the official ones.
+
+One difference to the official exercises is that the solution files will not be hidden until the user finishes an exercise.
+But you can trust the users to not look at the solution too early 😉
+
+## Share
+
+After publishing your set of exercises, open an issue or a pull request in the official Rustlings repository to link to your project in the README 😃

build.rs

@@ -1,5 +0,0 @@
-fn main() {
-    // Fix building from source on Windows because it can't handle file links.
-    #[cfg(windows)]
-    let _ = std::fs::copy("dev/Cargo.toml", "dev-Cargo.toml");
-}

clippy.toml

@@ -1,11 +1,13 @@
 disallowed-types = [
-  { path = "crossterm::style::Stylize", reason = "inefficient, use `.queue(…)` instead" },
-  { path = "crossterm::style::styled_content::StyledContent", reason = "inefficient, use `.queue(…)` instead" },
+  # Inefficient. Use `.queue(…)` instead.
+  "crossterm::style::Stylize",
+  "crossterm::style::styled_content::StyledContent",
 ]
 
 disallowed-methods = [
-  { path = "crossterm::style::style", reason = "inefficient, use `.queue(…)` instead" },
-  { path = "std::thread::spawn", replacement = "std::thread::Builder::spawn", reason = "handle the error" },
-  { path = "std::thread::Scope::spawn", replacement = "std::thread::Builder::spawn", reason = "handle the error" },
-  { path = "std::process::exit", replacement = "std::process::ExitCode" },
+  # We use `ahash` instead of the default hasher.
+  "std::collections::HashSet::new",
+  "std::collections::HashSet::with_capacity",
+  # Inefficient. Use `.queue(…)` instead.
+  "crossterm::style::style",
 ]

dev/Cargo.toml

@@ -1,4 +1,4 @@
-# Don't edit the `bin` list manually! It is updated by `cargo dev update`. This comment line will be stripped in `rustlings init`.
+# Don't edit the `bin` list manually! It is updated by `cargo run -- dev update`. This comment line will be stripped in `rustlings init`.
 bin = [
   { name = "intro1", path = "../exercises/00_intro/intro1.rs" },
   { name = "intro1_sol", path = "../solutions/00_intro/intro1.rs" },
@@ -192,7 +192,7 @@ bin = [
 
 [package]
 name = "exercises"
-edition = "2024"
+edition = "2021"
 # Don't publish the exercises on crates.io!
 publish = false
 
@@ -203,21 +203,17 @@ panic = "abort"
 panic = "abort"
 
 [lints.rust]
-# You shouldn't write unsafe code in Rustlings!
+# You shouldn't write unsafe code in Rustlings
 unsafe_code = "forbid"
-# You don't need unstable features in Rustlings and shouldn't rely on them while learning Rust.
+# You don't need unstable features in Rustlings and shouldn't rely on them while learning Rust
 unstable_features = "forbid"
-# Dead code warnings can't be avoided in some exercises and might distract while learning.
-dead_code = "allow"
 
 [lints.clippy]
-# You forgot a `todo!()`!
+# You forgot a `todo!()`
 todo = "forbid"
-# This can only happen by mistake in Rustlings.
+# This can only happen by mistake in Rustlings
 empty_loop = "forbid"
-# No infinite loops are needed in Rustlings.
+# No infinite loops are needed in Rustlings
 infinite_loop = "deny"
-# You shouldn't leak memory while still learning Rust!
+# You shouldn't leak memory while still learning Rust
 mem_forget = "deny"
-# Currently, there are no disallowed methods. This line avoids problems when developing Rustlings.
-disallowed_methods = "allow"

exercises/01_variables/README.md

@@ -1,7 +1,7 @@
 # Variables
 
 In Rust, variables are immutable by default.
-When a variable is immutable, once a value is bound to a name, you can't change that value.
+When a variable is immutable, once a value is bound to a name, you can’t change that value.
 You can make them mutable by adding `mut` in front of the variable name.
 
 ## Further information

exercises/01_variables/variables5.rs

@@ -1,6 +1,6 @@
 fn main() {
     let number = "T-H-R-E-E"; // Don't change this line
-    println!("Spell a number: {number}");
+    println!("Spell a number: {}", number);
 
     // TODO: Fix the compiler error by changing the line below without renaming the variable.
     number = 3;

exercises/03_if/if2.rs

@@ -1,7 +1,7 @@
 // TODO: Fix the compiler error on this function.
-fn picky_eater(food: &str) -> &str {
-    if food == "strawberry" {
-        "Yummy!"
+fn foo_if_fizz(fizzish: &str) -> &str {
+    if fizzish == "fizz" {
+        "foo"
     } else {
         1
     }
@@ -18,20 +18,18 @@ mod tests {
     use super::*;
 
     #[test]
-    fn yummy_food() {
-        // This means that calling `picky_eater` with the argument "strawberry" should return "Yummy!".
-        assert_eq!(picky_eater("strawberry"), "Yummy!");
+    fn foo_for_fizz() {
+        // This means that calling `foo_if_fizz` with the argument "fizz" should return "foo".
+        assert_eq!(foo_if_fizz("fizz"), "foo");
     }
 
     #[test]
-    fn neutral_food() {
-        assert_eq!(picky_eater("potato"), "I guess I can eat that.");
+    fn bar_for_fuzz() {
+        assert_eq!(foo_if_fizz("fuzz"), "bar");
     }
 
     #[test]
-    fn default_disliked_food() {
-        assert_eq!(picky_eater("broccoli"), "No thanks!");
-        assert_eq!(picky_eater("gummy bears"), "No thanks!");
-        assert_eq!(picky_eater("literally anything"), "No thanks!");
+    fn default_to_baz() {
+        assert_eq!(foo_if_fizz("literally anything"), "baz");
     }
 }

exercises/05_vecs/vecs2.rs

@@ -9,6 +9,26 @@ fn vec_loop(input: &[i32]) -> Vec<i32> {
     output
 }
 
+fn vec_map_example(input: &[i32]) -> Vec<i32> {
+    // An example of collecting a vector after mapping.
+    // We map each element of the `input` slice to its value plus 1.
+    // If the input is `[1, 2, 3]`, the output is `[2, 3, 4]`.
+    input.iter().map(|element| element + 1).collect()
+}
+
+fn vec_map(input: &[i32]) -> Vec<i32> {
+    // TODO: Here, we also want to multiply each element in the `input` slice
+    // by 2, but with iterator mapping instead of manually pushing into an empty
+    // vector.
+    // See the example in the function `vec_map_example` above.
+    input
+        .iter()
+        .map(|element| {
+            // ???
+        })
+        .collect()
+}
+
 fn main() {
     // You can optionally experiment here.
 }
@@ -23,4 +43,18 @@ mod tests {
         let ans = vec_loop(&input);
         assert_eq!(ans, [4, 8, 12, 16, 20]);
     }
+
+    #[test]
+    fn test_vec_map_example() {
+        let input = [1, 2, 3];
+        let ans = vec_map_example(&input);
+        assert_eq!(ans, [2, 3, 4]);
+    }
+
+    #[test]
+    fn test_vec_map() {
+        let input = [2, 4, 6, 8, 10];
+        let ans = vec_map(&input);
+        assert_eq!(ans, [4, 8, 12, 16, 20]);
+    }
 }

exercises/08_enums/README.md

@@ -1,10 +1,10 @@
 # Enums
 
 Rust allows you to define types called "enums" which enumerate possible values.
-Enums are a feature in many languages, but their capabilities differ in each language. Rust's enums are most similar to algebraic data types in functional languages, such as F#, OCaml, and Haskell.
+Enums are a feature in many languages, but their capabilities differ in each language. Rust’s enums are most similar to algebraic data types in functional languages, such as F#, OCaml, and Haskell.
 Useful in combination with enums is Rust's "pattern matching" facility, which makes it easy to run different code for different values of an enumeration.
 
 ## Further information
 
 - [Enums](https://doc.rust-lang.org/book/ch06-00-enums.html)
-- [Pattern syntax](https://doc.rust-lang.org/book/ch19-03-pattern-syntax.html)
+- [Pattern syntax](https://doc.rust-lang.org/book/ch18-03-pattern-syntax.html)

exercises/08_enums/enums2.rs

@@ -1,3 +1,5 @@
+#![allow(dead_code)]
+
 #[derive(Debug)]
 struct Point {
     x: u64,

exercises/08_enums/enums3.rs

@@ -4,11 +4,7 @@ struct Point {
 }
 
 enum Message {
-    Resize { width: u64, height: u64 },
-    Move(Point),
-    Echo(String),
-    ChangeColor(u8, u8, u8),
-    Quit,
+    // TODO: Implement the message variant types based on their usage below.
 }
 
 struct State {

exercises/09_strings/strings3.rs

@@ -23,7 +23,6 @@ mod tests {
         assert_eq!(trim_me("Hello!     "), "Hello!");
         assert_eq!(trim_me("  What's up!"), "What's up!");
         assert_eq!(trim_me("   Hola!  "), "Hola!");
-        assert_eq!(trim_me("Hi!"), "Hi!");
     }
 
     #[test]

exercises/10_modules/modules2.rs

@@ -1,6 +1,7 @@
 // You can bring module paths into scopes and provide new names for them with
 // the `use` and `as` keywords.
 
+#[allow(dead_code)]
 mod delicious_snacks {
     // TODO: Add the following two `use` statements after fixing them.
     // use self::fruits::PEAR as ???;

exercises/11_hashmaps/hashmaps3.rs

@@ -17,7 +17,7 @@ struct TeamScores {
 
 fn build_scores_table(results: &str) -> HashMap<&str, TeamScores> {
     // The name of the team is the key and its associated struct is the value.
-    let mut scores = HashMap::<&str, TeamScores>::new();
+    let mut scores = HashMap::new();
 
     for line in results.lines() {
         let mut split_iterator = line.split(',');

exercises/12_options/options1.rs

@@ -1,8 +1,8 @@
-// This function returns how much ice cream there is left in the fridge.
+// This function returns how much icecream there is left in the fridge.
 // If it's before 22:00 (24-hour system), then 5 scoops are left. At 22:00,
-// someone eats it all, so no ice cream is left (value 0). Return `None` if
+// someone eats it all, so no icecream is left (value 0). Return `None` if
 // `hour_of_day` is higher than 23.
-fn maybe_ice_cream(hour_of_day: u16) -> Option<u16> {
+fn maybe_icecream(hour_of_day: u16) -> Option<u16> {
     // TODO: Complete the function body.
 }
 
@@ -18,19 +18,19 @@ mod tests {
     fn raw_value() {
         // TODO: Fix this test. How do you get the value contained in the
         // Option?
-        let ice_creams = maybe_ice_cream(12);
+        let icecreams = maybe_icecream(12);
 
-        assert_eq!(ice_creams, 5); // Don't change this line.
+        assert_eq!(icecreams, 5); // Don't change this line.
     }
 
     #[test]
-    fn check_ice_cream() {
-        assert_eq!(maybe_ice_cream(0), Some(5));
-        assert_eq!(maybe_ice_cream(9), Some(5));
-        assert_eq!(maybe_ice_cream(18), Some(5));
-        assert_eq!(maybe_ice_cream(22), Some(0));
-        assert_eq!(maybe_ice_cream(23), Some(0));
-        assert_eq!(maybe_ice_cream(24), None);
-        assert_eq!(maybe_ice_cream(25), None);
+    fn check_icecream() {
+        assert_eq!(maybe_icecream(0), Some(5));
+        assert_eq!(maybe_icecream(9), Some(5));
+        assert_eq!(maybe_icecream(18), Some(5));
+        assert_eq!(maybe_icecream(22), Some(0));
+        assert_eq!(maybe_icecream(23), Some(0));
+        assert_eq!(maybe_icecream(24), None);
+        assert_eq!(maybe_icecream(25), None);
     }
 }

exercises/12_options/options3.rs

@@ -9,7 +9,7 @@ fn main() {
 
     // TODO: Fix the compiler error by adding something to this match statement.
     match optional_point {
-        Some(p) => println!("Coordinates are {},{}", p.x, p.y),
+        Some(p) => println!("Co-ordinates are {},{}", p.x, p.y),
         _ => panic!("No match!"),
     }
 

exercises/13_error_handling/README.md

@@ -1,8 +1,8 @@
 # Error handling
 
-Most errors aren't serious enough to require the program to stop entirely.
-Sometimes, when a function fails, it's for a reason that you can easily interpret and respond to.
-For example, if you try to open a file and that operation fails because the file doesn't exist, you might want to create the file instead of terminating the process.
+Most errors aren’t serious enough to require the program to stop entirely.
+Sometimes, when a function fails, it’s for a reason that you can easily interpret and respond to.
+For example, if you try to open a file and that operation fails because the file doesn’t exist, you might want to create the file instead of terminating the process.
 
 ## Further information
 

exercises/13_error_handling/errors4.rs

@@ -10,7 +10,6 @@ struct PositiveNonzeroInteger(u64);
 impl PositiveNonzeroInteger {
     fn new(value: i64) -> Result<Self, CreationError> {
         // TODO: This function shouldn't always return an `Ok`.
-        // Read the tests below to clarify what should be returned.
         Ok(Self(value as u64))
     }
 }

exercises/13_error_handling/errors5.rs

@@ -6,7 +6,7 @@
 //
 // 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. 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 exercise, that context is the potential errors which
 // can be returned in a `Result`.

exercises/15_traits/traits3.rs

@@ -1,3 +1,5 @@
+#![allow(dead_code)]
+
 trait Licensed {
     // TODO: Add a default implementation for `licensing_info` so that
     // implementors like the two structs below can share that default behavior

exercises/18_iterators/iterators3.rs

@@ -39,8 +39,6 @@ mod tests {
     #[test]
     fn test_success() {
         assert_eq!(divide(81, 9), Ok(9));
-        assert_eq!(divide(81, -1), Ok(-81));
-        assert_eq!(divide(i64::MIN, i64::MIN), Ok(1));
     }
 
     #[test]

exercises/19_smart_pointers/rc1.rs

@@ -8,6 +8,7 @@ use std::rc::Rc;
 #[derive(Debug)]
 struct Sun;
 
+#[allow(dead_code)]
 #[derive(Debug)]
 enum Planet {
     Mercury(Rc<Sun>),

exercises/20_threads/threads1.rs

@@ -1,5 +1,5 @@
-// This program spawns multiple threads that each runs for at least 250ms, and
-// each thread returns how much time it took to complete. The program should
+// 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
 // wait until all the spawned threads have finished and should collect their
 // return values into a vector.
 

exercises/21_macros/README.md

@@ -10,6 +10,5 @@ of exercises to Rustlings, but is all about learning to write Macros.
 
 ## Further information
 
-- [The Rust Book - Macros](https://doc.rust-lang.org/book/ch20-05-macros.html)
+- [Macros](https://doc.rust-lang.org/book/ch19-06-macros.html)
 - [The Little Book of Rust Macros](https://veykril.github.io/tlborm/)
-- [Rust by Example - macro_rules!](https://doc.rust-lang.org/rust-by-example/macros.html)

exercises/22_clippy/clippy3.rs

@@ -1,25 +1,22 @@
-// Here are some more easy Clippy fixes so you can see its utility.
+// Here are some more easy Clippy fixes so you can see its utility 📎
 // TODO: Fix all the Clippy lints.
 
+#[rustfmt::skip]
 #[allow(unused_variables, unused_assignments)]
 fn main() {
-    let my_option: Option<&str> = None;
-    // Assume that you don't know the value of `my_option`.
-    // In the case of `Some`, we want to print its value.
+    let my_option: Option<()> = None;
     if my_option.is_none() {
-        println!("{}", my_option.unwrap());
+        println!("{:?}", my_option.unwrap());
     }
 
-    #[rustfmt::skip]
     let my_arr = &[
         -1, -2, -3
         -4, -5, -6
     ];
     println!("My array! Here it is: {my_arr:?}");
 
-    let mut my_vec = vec![1, 2, 3, 4, 5];
-    my_vec.resize(0, 5);
-    println!("This Vec is empty, see? {my_vec:?}");
+    let my_empty_vec = vec![1, 2, 3, 4, 5].resize(0, 5);
+    println!("This Vec is empty, see? {my_empty_vec:?}");
 
     let mut value_a = 45;
     let mut value_b = 66;

exercises/23_conversions/as_ref_mut.rs

@@ -2,11 +2,10 @@
 // about them at https://doc.rust-lang.org/std/convert/trait.AsRef.html and
 // https://doc.rust-lang.org/std/convert/trait.AsMut.html, respectively.
 
-// Obtain the number of bytes (not characters) in the given argument
-// (`.len()` returns the number of bytes in a string).
+// Obtain the number of bytes (not characters) in the given argument.
 // TODO: Add the `AsRef` trait appropriately as a trait bound.
 fn byte_counter<T>(arg: T) -> usize {
-    arg.as_ref().len()
+    arg.as_ref().as_bytes().len()
 }
 
 // Obtain the number of characters (not bytes) in the given argument.

exercises/23_conversions/from_str.rs

@@ -25,7 +25,7 @@ enum ParsePersonError {
     ParseInt(ParseIntError),
 }
 
-// TODO: Complete this `FromStr` implementation to be able to parse a `Person`
+// TODO: Complete this `From` implementation to be able to parse a `Person`
 // out of a string in the form of "Mark,20".
 // Note that you'll need to parse the age component into a `u8` with something
 // like `"4".parse::<u8>()`.

exercises/README.md

@@ -9,7 +9,7 @@
 | vecs                   | §8.1                |
 | move_semantics         | §4.1-2              |
 | structs                | §5.1, §5.3          |
-| enums                  | §6, §19.3           |
+| enums                  | §6, §18.3           |
 | strings                | §8.2                |
 | modules                | §7                  |
 | hashmaps               | §8.3                |
@@ -22,6 +22,6 @@
 | iterators              | §13.2-4             |
 | smart_pointers         | §15, §16.3          |
 | threads                | §16.1-3             |
-| macros                 | §20.5               |
-| clippy                 | Appendix D          |
+| macros                 | §19.5               |
+| clippy                 | §21.4               |
 | conversions            | n/a                 |

oranda.json

@@ -0,0 +1,13 @@
+{
+  "project": {
+    "homepage": "https://rustlings.cool",
+    "repository": "https://github.com/rust-lang/rustlings"
+  },
+  "marketing": {
+    "analytics": {
+      "plausible": {
+        "domain": "rustlings.cool"
+      }
+    }
+  }
+}

release-hook.sh

@@ -9,8 +9,5 @@ cargo upgrades
 # Similar to CI
 cargo clippy -- --deny warnings
 cargo fmt --all --check
-cargo test --workspace
-cargo dev check --require-solutions
-
-# MSRV
-cargo +1.88 dev check --require-solutions
+cargo test --workspace --all-targets
+cargo run -- dev check --require-solutions

rustlings-macros/Cargo.toml

@@ -16,9 +16,9 @@ include = [
 proc-macro = true
 
 [dependencies]
-quote = "1.0"
+quote = "1.0.37"
 serde.workspace = true
-toml.workspace = true
+toml_edit.workspace = true
 
 [lints]
 workspace = true

rustlings-macros/info.toml

@@ -1,7 +1,6 @@
 format_version = 1
 
-welcome_message = """
-Is this your first time? Don't worry, Rustlings is made for beginners!
+welcome_message = """Is this your first time? Don't worry, Rustlings is made for beginners!
 We are going to teach you a lot of things about Rust, but before we can
 get started, here are some notes about how Rustlings operates:
 
@@ -11,16 +10,15 @@ get started, here are some notes about how Rustlings operates:
    and fix them!
 2. Make sure to have your editor open in the `rustlings/` directory. Rustlings
    will show you the path of the current exercise under the progress bar. Open
-   the exercise file in your editor, fix errors and save the file. Rustlings
-   will automatically detect the file change and rerun the exercise. If all
-   errors are fixed, Rustlings will ask you to move on to the next exercise.
+   the exercise file in your editor, fix errors and save the file. Rustlings will
+   automatically detect the file change and rerun the exercise. If all errors are
+   fixed, Rustlings will ask you to move on to the next exercise.
 3. If you're stuck on an exercise, enter `h` to show a hint.
-4. If an exercise doesn't make sense to you, feel free to open an issue on
-   GitHub! (https://github.com/rust-lang/rustlings). We look at every issue, and
-   sometimes, other learners do too so you can help each other out!"""
+4. If an exercise doesn't make sense to you, feel free to open an issue on GitHub!
+   (https://github.com/rust-lang/rustlings). We look at every issue, and sometimes,
+   other learners do too so you can help each other out!"""
 
-final_message = """
-We hope you enjoyed learning about the various aspects of Rust!
+final_message = """We hope you enjoyed learning about the various aspects of Rust!
 If you noticed any issues, don't hesitate to report them on Github.
 You can also contribute your own exercises to help the greater community!
 
@@ -122,10 +120,10 @@ dir = "01_variables"
 test = false
 hint = """
 We know about variables and mutability, but there is another important type of
-variable available: constants.
+variables available: constants.
 
-Constants are always immutable. They are declared with the keyword `const`
-instead of `let`.
+Constants are always immutable. They are declared with the keyword `const` instead
+of `let`.
 
 The type of Constants must always be annotated.
 
@@ -255,7 +253,7 @@ require you to type in 100 items (but you certainly can if you want!).
 
 For example, you can do:
 ```
-let array = ["Are we there yet?"; 100];
+let array = ["Are we there yet?"; 10];
 ```
 
 Bonus: what are some other things you could have that would return `true`
@@ -318,7 +316,15 @@ of the Rust book to learn more."""
 name = "vecs2"
 dir = "05_vecs"
 hint = """
-Use the `.push()` method on the vector to push new elements to it."""
+In the first function, we create an empty vector and want to push new elements
+to it.
+
+In the second function, we map the values of the input and collect them into a vector.
+
+After you've completed both functions, decide for yourself which approach you
+like better.
+
+What do you think is the more commonly used pattern under Rust developers?"""
 
 # MOVE SEMANTICS
 
@@ -326,8 +332,8 @@ Use the `.push()` method on the vector to push new elements to it."""
 name = "move_semantics1"
 dir = "06_move_semantics"
 hint = """
-So you've got the "cannot borrow `vec` as mutable, as it is not declared as
-mutable" error on the line where we push an element to the vector, right?
+So you've got the "cannot borrow `vec` as mutable, as it is not declared as mutable"
+error on the line where we push an element to the vector, right?
 
 The fix for this is going to be adding one keyword, and the addition is NOT on
 the line where we push to the vector (where the error is).
@@ -363,8 +369,7 @@ hint = """
 Carefully reason about the range in which each mutable reference is in
 scope. Does it help to update the value of `x` immediately after
 the mutable reference is taken?
-Read more about 'Mutable References' in the book's section 'References and
-Borrowing':
+Read more about 'Mutable References' in the book's section 'References and Borrowing':
 https://doc.rust-lang.org/book/ch04-02-references-and-borrowing.html#mutable-references."""
 
 [[exercises]]
@@ -503,8 +508,7 @@ name = "strings4"
 dir = "09_strings"
 test = false
 hint = """
-Replace `placeholder` with either `string` or `string_slice` in the `main`
-function.
+Replace `placeholder` with either `string` or `string_slice` in the `main` function.
 
 Example:
 `placeholder("blue");`
@@ -566,8 +570,12 @@ https://doc.rust-lang.org/book/ch08-03-hash-maps.html#only-inserting-a-value-if-
 name = "hashmaps3"
 dir = "11_hashmaps"
 hint = """
-Hint 1: Use the `entry()` and `or_default()` methods of `HashMap` to insert the
-        default value of `TeamScores` if a team doesn't exist in the table yet.
+Hint 1: Use the `entry()` and `or_insert()` (or `or_insert_with()`) methods of
+        `HashMap` to insert the default value of `TeamScores` if a team doesn't
+        exist in the table yet.
+
+Learn more in The Book:
+https://doc.rust-lang.org/book/ch08-03-hash-maps.html#only-inserting-a-value-if-the-key-has-no-value
 
 Hint 2: If there is already an entry for a given key, the value returned by
         `entry()` can be updated based on the existing value.
@@ -755,7 +763,7 @@ Notice how the trait takes ownership of `self` and returns `Self`.
 
 Although the signature of `append_bar` in the trait takes `self` as argument,
 the implementation can take `mut self` instead. This is possible because the
-value is owned anyway."""
+the value is owned anyway."""
 
 [[exercises]]
 name = "traits3"
@@ -1131,7 +1139,7 @@ constants, but clippy recognizes those imprecise mathematical constants as a
 source of potential error.
 
 See the suggestions of the Clippy warning in the compile output and use the
-appropriate replacement constant from `std::f32::consts`."""
+appropriate replacement constant from `std::f32::consts`..."""
 
 [[exercises]]
 name = "clippy2"
@@ -1192,8 +1200,7 @@ hint = """
 Is there an implementation of `TryFrom` in the standard library that can both do
 the required integer conversion and check the range of the input?
 
-Challenge: Can you make the `TryFrom` implementations generic over many integer
-types?"""
+Challenge: Can you make the `TryFrom` implementations generic over many integer types?"""
 
 [[exercises]]
 name = "as_ref_mut"

rustlings-macros/src/lib.rs

@@ -16,7 +16,7 @@ struct InfoFile {
 #[proc_macro]
 pub fn include_files(_: TokenStream) -> TokenStream {
     let info_file = include_str!("../info.toml");
-    let exercises = toml::de::from_str::<InfoFile>(info_file)
+    let exercises = toml_edit::de::from_str::<InfoFile>(info_file)
         .expect("Failed to parse `info.toml`")
         .exercises;
 

solutions/01_variables/variables5.rs

@@ -1,6 +1,6 @@
 fn main() {
     let number = "T-H-R-E-E";
-    println!("Spell a number: {number}");
+    println!("Spell a number: {}", number);
 
     // Using variable shadowing
     // https://doc.rust-lang.org/book/ch03-01-variables-and-mutability.html#shadowing

solutions/03_if/if1.rs

@@ -1,5 +1,9 @@
 fn bigger(a: i32, b: i32) -> i32 {
-    if a > b { a } else { b }
+    if a > b {
+        a
+    } else {
+        b
+    }
 }
 
 fn main() {

solutions/03_if/if2.rs

@@ -1,10 +1,10 @@
-fn picky_eater(food: &str) -> &str {
-    if food == "strawberry" {
-        "Yummy!"
-    } else if food == "potato" {
-        "I guess I can eat that."
+fn foo_if_fizz(fizzish: &str) -> &str {
+    if fizzish == "fizz" {
+        "foo"
+    } else if fizzish == "fuzz" {
+        "bar"
     } else {
-        "No thanks!"
+        "baz"
     }
 }
 
@@ -17,19 +17,17 @@ mod tests {
     use super::*;
 
     #[test]
-    fn yummy_food() {
-        assert_eq!(picky_eater("strawberry"), "Yummy!");
+    fn foo_for_fizz() {
+        assert_eq!(foo_if_fizz("fizz"), "foo");
     }
 
     #[test]
-    fn neutral_food() {
-        assert_eq!(picky_eater("potato"), "I guess I can eat that.");
+    fn bar_for_fuzz() {
+        assert_eq!(foo_if_fizz("fuzz"), "bar");
     }
 
     #[test]
-    fn default_disliked_food() {
-        assert_eq!(picky_eater("broccoli"), "No thanks!");
-        assert_eq!(picky_eater("gummy bears"), "No thanks!");
-        assert_eq!(picky_eater("literally anything"), "No thanks!");
+    fn default_to_baz() {
+        assert_eq!(foo_if_fizz("literally anything"), "baz");
     }
 }

solutions/05_vecs/vecs2.rs

@@ -8,6 +8,22 @@ fn vec_loop(input: &[i32]) -> Vec<i32> {
     output
 }
 
+fn vec_map_example(input: &[i32]) -> Vec<i32> {
+    // An example of collecting a vector after mapping.
+    // We map each element of the `input` slice to its value plus 1.
+    // If the input is `[1, 2, 3]`, the output is `[2, 3, 4]`.
+    input.iter().map(|element| element + 1).collect()
+}
+
+fn vec_map(input: &[i32]) -> Vec<i32> {
+    // We will dive deeper into iterators, but for now, this is all what you
+    // had to do!
+    // Advanced note: This method is more efficient because it automatically
+    // preallocates enough capacity. This can be done manually in `vec_loop`
+    // using `Vec::with_capacity(input.len())` instead of `Vec::new()`.
+    input.iter().map(|element| 2 * element).collect()
+}
+
 fn main() {
     // You can optionally experiment here.
 }
@@ -22,4 +38,18 @@ mod tests {
         let ans = vec_loop(&input);
         assert_eq!(ans, [4, 8, 12, 16, 20]);
     }
+
+    #[test]
+    fn test_vec_map_example() {
+        let input = [1, 2, 3];
+        let ans = vec_map_example(&input);
+        assert_eq!(ans, [2, 3, 4]);
+    }
+
+    #[test]
+    fn test_vec_map() {
+        let input = [2, 4, 6, 8, 10];
+        let ans = vec_map(&input);
+        assert_eq!(ans, [4, 8, 12, 16, 20]);
+    }
 }

solutions/06_move_semantics/move_semantics4.rs

@@ -4,6 +4,8 @@ fn main() {
 
 #[cfg(test)]
 mod tests {
+    // TODO: Fix the compiler errors only by reordering the lines in the test.
+    // Don't add, change or remove any line.
     #[test]
     fn move_semantics4() {
         let mut x = Vec::new();

solutions/08_enums/enums2.rs

@@ -1,3 +1,5 @@
+#![allow(dead_code)]
+
 #[derive(Debug)]
 struct Point {
     x: u64,

solutions/08_enums/enums3.rs

@@ -46,8 +46,8 @@ impl State {
         match message {
             Message::Resize { width, height } => self.resize(width, height),
             Message::Move(point) => self.move_position(point),
-            Message::Echo(string) => self.echo(string),
-            Message::ChangeColor(red, green, blue) => self.change_color(red, green, blue),
+            Message::Echo(s) => self.echo(s),
+            Message::ChangeColor(r, g, b) => self.change_color(r, g, b),
             Message::Quit => self.quit(),
         }
     }

solutions/09_strings/strings3.rs

@@ -26,7 +26,6 @@ mod tests {
         assert_eq!(trim_me("Hello!     "), "Hello!");
         assert_eq!(trim_me("  What's up!"), "What's up!");
         assert_eq!(trim_me("   Hola!  "), "Hola!");
-        assert_eq!(trim_me("Hi!"), "Hi!");
     }
 
     #[test]

solutions/09_strings/strings4.rs

@@ -19,7 +19,7 @@ fn main() {
     // `.into()` converts a type into an expected type.
     // If it is called where `String` is expected, it will convert `&str` to `String`.
     string("nice weather".into());
-    // But if it is called where `&str` is expected, then `&str` is kept as `&str` since no conversion is needed.
+    // But if it is called where `&str` is expected, then `&str` is kept `&str` since no conversion is needed.
     // If you remove the `#[allow(…)]` line, then Clippy will tell you to remove `.into()` below since it is a useless conversion.
     #[allow(clippy::useless_conversion)]
     string_slice("nice weather".into());

solutions/10_modules/modules2.rs

@@ -1,3 +1,4 @@
+#[allow(dead_code)]
 mod delicious_snacks {
     // Added `pub` and used the expected alias after `as`.
     pub use self::fruits::PEAR as fruit;

solutions/11_hashmaps/hashmaps1.rs

@@ -1,7 +1,7 @@
 // A basket of fruits in the form of a hash map needs to be defined. The key
 // represents the name of the fruit and the value represents how many of that
 // particular fruit is in the basket. You have to put at least 3 different
-// types of fruits (e.g. apple, banana, mango) in the basket and the total count
+// types of fruits (e.g apple, banana, mango) in the basket and the total count
 // of all the fruits should be at least 5.
 
 use std::collections::HashMap;

solutions/11_hashmaps/hashmaps3.rs

@@ -17,7 +17,7 @@ struct TeamScores {
 
 fn build_scores_table(results: &str) -> HashMap<&str, TeamScores> {
     // The name of the team is the key and its associated struct is the value.
-    let mut scores = HashMap::<&str, TeamScores>::new();
+    let mut scores = HashMap::new();
 
     for line in results.lines() {
         let mut split_iterator = line.split(',');
@@ -28,13 +28,17 @@ fn build_scores_table(results: &str) -> HashMap<&str, TeamScores> {
         let team_2_score: u8 = split_iterator.next().unwrap().parse().unwrap();
 
         // Insert the default with zeros if a team doesn't exist yet.
-        let team_1 = scores.entry(team_1_name).or_default();
+        let team_1 = scores
+            .entry(team_1_name)
+            .or_insert_with(TeamScores::default);
         // Update the values.
         team_1.goals_scored += team_1_score;
         team_1.goals_conceded += team_2_score;
 
         // Similarly for the second team.
-        let team_2 = scores.entry(team_2_name).or_default();
+        let team_2 = scores
+            .entry(team_2_name)
+            .or_insert_with(TeamScores::default);
         team_2.goals_scored += team_2_score;
         team_2.goals_conceded += team_1_score;
     }
@@ -60,11 +64,9 @@ England,Spain,1,0";
     fn build_scores() {
         let scores = build_scores_table(RESULTS);
 
-        assert!(
-            ["England", "France", "Germany", "Italy", "Poland", "Spain"]
-                .into_iter()
-                .all(|team_name| scores.contains_key(team_name))
-        );
+        assert!(["England", "France", "Germany", "Italy", "Poland", "Spain"]
+            .into_iter()
+            .all(|team_name| scores.contains_key(team_name)));
     }
 
     #[test]

solutions/12_options/options1.rs

@@ -1,8 +1,8 @@
-// This function returns how much ice cream there is left in the fridge.
+// This function returns how much icecream there is left in the fridge.
 // If it's before 22:00 (24-hour system), then 5 scoops are left. At 22:00,
-// someone eats it all, so no ice cream is left (value 0). Return `None` if
+// someone eats it all, so no icecream is left (value 0). Return `None` if
 // `hour_of_day` is higher than 23.
-fn maybe_ice_cream(hour_of_day: u16) -> Option<u16> {
+fn maybe_icecream(hour_of_day: u16) -> Option<u16> {
     match hour_of_day {
         0..=21 => Some(5),
         22..=23 => Some(0),
@@ -21,19 +21,19 @@ mod tests {
     #[test]
     fn raw_value() {
         // Using `unwrap` is fine in a test.
-        let ice_creams = maybe_ice_cream(12).unwrap();
+        let icecreams = maybe_icecream(12).unwrap();
 
-        assert_eq!(ice_creams, 5);
+        assert_eq!(icecreams, 5);
     }
 
     #[test]
-    fn check_ice_cream() {
-        assert_eq!(maybe_ice_cream(0), Some(5));
-        assert_eq!(maybe_ice_cream(9), Some(5));
-        assert_eq!(maybe_ice_cream(18), Some(5));
-        assert_eq!(maybe_ice_cream(22), Some(0));
-        assert_eq!(maybe_ice_cream(23), Some(0));
-        assert_eq!(maybe_ice_cream(24), None);
-        assert_eq!(maybe_ice_cream(25), None);
+    fn check_icecream() {
+        assert_eq!(maybe_icecream(0), Some(5));
+        assert_eq!(maybe_icecream(9), Some(5));
+        assert_eq!(maybe_icecream(18), Some(5));
+        assert_eq!(maybe_icecream(22), Some(0));
+        assert_eq!(maybe_icecream(23), Some(0));
+        assert_eq!(maybe_icecream(24), None);
+        assert_eq!(maybe_icecream(25), None);
     }
 }

solutions/12_options/options3.rs

@@ -10,7 +10,7 @@ fn main() {
     // Solution 1: Matching over the `Option` (not `&Option`) but without moving
     // out of the `Some` variant.
     match optional_point {
-        Some(ref p) => println!("Coordinates are {},{}", p.x, p.y),
+        Some(ref p) => println!("Co-ordinates are {},{}", p.x, p.y),
         //   ^^^ added
         _ => panic!("No match!"),
     }
@@ -18,8 +18,7 @@ fn main() {
     // Solution 2: Matching over a reference (`&Option`) by added `&` before
     // `optional_point`.
     match &optional_point {
-        //^ added
-        Some(p) => println!("Coordinates are {},{}", p.x, p.y),
+        Some(p) => println!("Co-ordinates are {},{}", p.x, p.y),
         _ => panic!("No match!"),
     }
 

solutions/13_error_handling/errors2.rs

@@ -16,7 +16,7 @@
 
 use std::num::ParseIntError;
 
-#[allow(unused_variables, clippy::question_mark)]
+#[allow(unused_variables)]
 fn total_cost(item_quantity: &str) -> Result<i32, ParseIntError> {
     let processing_fee = 1;
     let cost_per_item = 5;

solutions/13_error_handling/errors5.rs

@@ -6,7 +6,7 @@
 //
 // 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. 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 exercise, that context is the potential errors which
 // can be returned in a `Result`.

solutions/13_error_handling/errors6.rs

@@ -29,21 +29,6 @@ impl ParsePosNonzeroError {
     }
 }
 
-// As an alternative solution, implementing the `From` trait allows for the
-// automatic conversion from a `ParseIntError` into a `ParsePosNonzeroError`
-// using the `?` operator, without the need to call `map_err`.
-//
-// ```
-// let x: i64 = s.parse()?;
-// ```
-//
-// Traits like `From` will be dealt with in later exercises.
-impl From<ParseIntError> for ParsePosNonzeroError {
-    fn from(err: ParseIntError) -> Self {
-        ParsePosNonzeroError::ParseInt(err)
-    }
-}
-
 #[derive(PartialEq, Debug)]
 struct PositiveNonzeroInteger(u64);
 

solutions/15_traits/traits3.rs

@@ -1,3 +1,5 @@
+#![allow(dead_code)]
+
 trait Licensed {
     fn licensing_info(&self) -> String {
         "Default license".to_string()

solutions/16_lifetimes/lifetimes1.rs

@@ -5,7 +5,11 @@
 
 fn longest<'a>(x: &'a str, y: &'a str) -> &'a str {
     //    ^^^^     ^^          ^^          ^^
-    if x.len() > y.len() { x } else { y }
+    if x.len() > y.len() {
+        x
+    } else {
+        y
+    }
 }
 
 fn main() {

solutions/16_lifetimes/lifetimes2.rs

@@ -1,10 +1,14 @@
 fn longest<'a>(x: &'a str, y: &'a str) -> &'a str {
-    if x.len() > y.len() { x } else { y }
+    if x.len() > y.len() {
+        x
+    } else {
+        y
+    }
 }
 
 fn main() {
     let string1 = String::from("long string is long");
-    // Solution 1: You can move `strings2` out of the inner block so that it is
+    // Solution1: You can move `strings2` out of the inner block so that it is
     // not dropped before the print statement.
     let string2 = String::from("xyz");
     let result;
@@ -21,7 +25,7 @@ fn main() {
     {
         let string2 = String::from("xyz");
         result = longest(&string1, &string2);
-        // Solution 2: You can move the print statement into the inner block so
+        // Solution2: You can move the print statement into the inner block so
         // that it is executed before `string2` is dropped.
         println!("The longest string is '{result}'");
         // `string2` dropped here (end of the inner scope).

solutions/18_iterators/iterators3.rs

@@ -52,8 +52,6 @@ mod tests {
     #[test]
     fn test_success() {
         assert_eq!(divide(81, 9), Ok(9));
-        assert_eq!(divide(81, -1), Ok(-81));
-        assert_eq!(divide(i64::MIN, i64::MIN), Ok(1));
     }
 
     #[test]

solutions/19_smart_pointers/rc1.rs

@@ -8,6 +8,7 @@ use std::rc::Rc;
 #[derive(Debug)]
 struct Sun;
 
+#[allow(dead_code)]
 #[derive(Debug)]
 enum Planet {
     Mercury(Rc<Sun>),
@@ -63,10 +64,12 @@ mod tests {
         println!("reference count = {}", Rc::strong_count(&sun)); // 7 references
         saturn.details();
 
+        // TODO
         let uranus = Planet::Uranus(Rc::clone(&sun));
         println!("reference count = {}", Rc::strong_count(&sun)); // 8 references
         uranus.details();
 
+        // TODO
         let neptune = Planet::Neptune(Rc::clone(&sun));
         println!("reference count = {}", Rc::strong_count(&sun)); // 9 references
         neptune.details();

solutions/20_threads/threads1.rs

@@ -1,5 +1,5 @@
-// This program spawns multiple threads that each runs for at least 250ms, and
-// each thread returns how much time it took to complete. The program should
+// 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
 // wait until all the spawned threads have finished and should collect their
 // return values into a vector.
 

solutions/21_macros/macros3.rs

@@ -1,4 +1,4 @@
-// Added the `macro_use` attribute.
+// Added the attribute `macro_use` attribute.
 #[macro_use]
 mod macros {
     macro_rules! my_macro {

solutions/22_clippy/clippy3.rs

@@ -1,31 +1,31 @@
 use std::mem;
 
+#[rustfmt::skip]
 #[allow(unused_variables, unused_assignments)]
 fn main() {
-    let my_option: Option<&str> = None;
+    let my_option: Option<()> = None;
     // `unwrap` of an `Option` after checking if it is `None` will panic.
     // Use `if-let` instead.
     if let Some(value) = my_option {
-        println!("{value}");
+        println!("{value:?}");
     }
 
     // A comma was missing.
-    #[rustfmt::skip]
     let my_arr = &[
         -1, -2, -3,
         -4, -5, -6,
     ];
-    println!("My array! Here it is: {my_arr:?}");
+    println!("My array! Here it is: {:?}", my_arr);
 
-    let mut my_vec = vec![1, 2, 3, 4, 5];
+    let mut my_empty_vec = vec![1, 2, 3, 4, 5];
     // `resize` mutates a vector instead of returning a new one.
     // `resize(0, …)` clears a vector, so it is better to use `clear`.
-    my_vec.clear();
-    println!("This Vec is empty, see? {my_vec:?}");
+    my_empty_vec.clear();
+    println!("This Vec is empty, see? {my_empty_vec:?}");
 
     let mut value_a = 45;
     let mut value_b = 66;
     // Use `mem::swap` to correctly swap two values.
     mem::swap(&mut value_a, &mut value_b);
-    println!("value a: {value_a}; value b: {value_b}");
+    println!("value a: {}; value b: {}", value_a, value_b);
 }

solutions/23_conversions/as_ref_mut.rs

@@ -2,10 +2,9 @@
 // about them at https://doc.rust-lang.org/std/convert/trait.AsRef.html and
 // https://doc.rust-lang.org/std/convert/trait.AsMut.html, respectively.
 
-// Obtain the number of bytes (not characters) in the given argument
-// (`.len()` returns the number of bytes in a string).
+// Obtain the number of bytes (not characters) in the given argument.
 fn byte_counter<T: AsRef<str>>(arg: T) -> usize {
-    arg.as_ref().len()
+    arg.as_ref().as_bytes().len()
 }
 
 // Obtain the number of characters (not bytes) in the given argument.

solutions/quizzes/quiz2.rs

@@ -62,8 +62,8 @@ mod tests {
     // Import `transformer`.
     use super::my_module::transformer;
 
-    use super::Command;
     use super::my_module::transformer_iter;
+    use super::Command;
 
     #[test]
     fn it_works() {

src/app_state.rs

@@ -1,39 +1,32 @@
-use anyhow::{Context, Error, Result, bail};
-use crossterm::{QueueableCommand, cursor, terminal};
+use anyhow::{bail, Context, Result};
 use std::{
-    collections::HashSet,
     env,
     fs::{File, OpenOptions},
-    io::{Read, Seek, StdoutLock, Write},
-    path::{MAIN_SEPARATOR_STR, Path},
+    io::{self, Read, Seek, StdoutLock, Write},
+    path::Path,
     process::{Command, Stdio},
-    sync::{
-        atomic::{AtomicUsize, Ordering::Relaxed},
-        mpsc,
-    },
     thread,
 };
 
 use crate::{
     clear_terminal,
     cmd::CmdRunner,
+    collections::hash_set_with_capacity,
     embedded::EMBEDDED_FILES,
     exercise::{Exercise, RunnableExercise},
     info_file::ExerciseInfo,
-    term::{self, CheckProgressVisualizer},
 };
 
 const STATE_FILE_NAME: &str = ".rustlings-state.txt";
-const DEFAULT_CHECK_PARALLELISM: usize = 8;
 
 #[must_use]
 pub enum ExercisesProgress {
     // All exercises are done.
     AllDone,
+    // The current exercise failed and is still pending.
+    CurrentPending,
     // A new exercise is now pending.
     NewPending,
-    // The current exercise is still pending.
-    CurrentPending,
 }
 
 pub enum StateFileStatus {
@@ -41,12 +34,10 @@ pub enum StateFileStatus {
     NotRead,
 }
 
-#[derive(Clone, Copy)]
-pub enum CheckProgress {
-    None,
-    Checking,
-    Done,
-    Pending,
+enum AllExercisesCheck {
+    Pending(usize),
+    AllDone,
+    CheckedUntil(usize),
 }
 
 pub struct AppState {
@@ -60,7 +51,8 @@ pub struct AppState {
     file_buf: Vec<u8>,
     official_exercises: bool,
     cmd_runner: CmdRunner,
-    emit_file_links: bool,
+    // Running in VS Code.
+    vs_code: bool,
 }
 
 impl AppState {
@@ -79,7 +71,6 @@ impl AppState {
                 format!("Failed to open or create the state file {STATE_FILE_NAME}")
             })?;
 
-        let dir_canonical_path = term::canonicalize("exercises");
         let mut exercises = exercise_infos
             .into_iter()
             .map(|exercise_info| {
@@ -91,32 +82,10 @@ impl AppState {
                 let dir = exercise_info.dir.map(|dir| &*dir.leak());
                 let hint = exercise_info.hint.leak().trim_ascii();
 
-                let canonical_path = dir_canonical_path.as_deref().map(|dir_canonical_path| {
-                    let mut canonical_path;
-                    if let Some(dir) = dir {
-                        canonical_path = String::with_capacity(
-                            2 + dir_canonical_path.len() + dir.len() + name.len(),
-                        );
-                        canonical_path.push_str(dir_canonical_path);
-                        canonical_path.push_str(MAIN_SEPARATOR_STR);
-                        canonical_path.push_str(dir);
-                    } else {
-                        canonical_path =
-                            String::with_capacity(1 + dir_canonical_path.len() + name.len());
-                        canonical_path.push_str(dir_canonical_path);
-                    }
-
-                    canonical_path.push_str(MAIN_SEPARATOR_STR);
-                    canonical_path.push_str(name);
-                    canonical_path.push_str(".rs");
-                    canonical_path
-                });
-
                 Exercise {
                     dir,
                     name,
                     path,
-                    canonical_path,
                     test: exercise_info.test,
                     strict_clippy: exercise_info.strict_clippy,
                     hint,
@@ -145,13 +114,13 @@ impl AppState {
                 break 'block StateFileStatus::NotRead;
             }
 
-            let mut done_exercises = HashSet::with_capacity(exercises.len());
+            let mut done_exercises = hash_set_with_capacity(exercises.len());
 
-            for done_exercise_name in lines {
-                if done_exercise_name.is_empty() {
+            for done_exerise_name in lines {
+                if done_exerise_name.is_empty() {
                     break;
                 }
-                done_exercises.insert(done_exercise_name);
+                done_exercises.insert(done_exerise_name);
             }
 
             for (ind, exercise) in exercises.iter_mut().enumerate() {
@@ -180,8 +149,7 @@ impl AppState {
             file_buf,
             official_exercises: !Path::new("info.toml").exists(),
             cmd_runner,
-            // VS Code has its own file link handling
-            emit_file_links: env::var_os("TERM_PROGRAM").is_none_or(|v| v != "vscode"),
+            vs_code: env::var_os("TERM_PROGRAM").is_some_and(|v| v == "vscode"),
         };
 
         Ok((slf, state_file_status))
@@ -202,11 +170,6 @@ impl AppState {
         self.n_done
     }
 
-    #[inline]
-    pub fn n_pending(&self) -> u16 {
-        self.exercises.len() as u16 - self.n_done
-    }
-
     #[inline]
     pub fn current_exercise(&self) -> &Exercise {
         &self.exercises[self.current_exercise_ind]
@@ -218,8 +181,8 @@ impl AppState {
     }
 
     #[inline]
-    pub fn emit_file_links(&self) -> bool {
-        self.emit_file_links
+    pub fn vs_code(&self) -> bool {
+        self.vs_code
     }
 
     // Write the state file.
@@ -283,31 +246,15 @@ impl AppState {
         self.write()
     }
 
-    // Set the status of an exercise without saving. Returns `true` if the
-    // status actually changed (and thus needs saving later).
-    pub fn set_status(&mut self, exercise_ind: usize, done: bool) -> Result<bool> {
+    pub fn set_pending(&mut self, exercise_ind: usize) -> Result<()> {
         let exercise = self
             .exercises
             .get_mut(exercise_ind)
             .context(BAD_INDEX_ERR)?;
 
-        if exercise.done == done {
-            return Ok(false);
-        }
-
-        exercise.done = done;
-        if done {
-            self.n_done += 1;
-        } else {
+        if exercise.done {
+            exercise.done = false;
             self.n_done -= 1;
-        }
-
-        Ok(true)
-    }
-
-    // Set the status of an exercise to "pending" and save.
-    pub fn set_pending(&mut self, exercise_ind: usize) -> Result<()> {
-        if self.set_status(exercise_ind, false)? {
             self.write()?;
         }
 
@@ -315,7 +262,7 @@ impl AppState {
     }
 
     // Official exercises: Dump the original file from the binary.
-    // Community exercises: Reset the exercise file with `git stash`.
+    // Third-party exercises: Reset the exercise file with `git stash`.
     fn reset(&self, exercise_ind: usize, path: &str) -> Result<()> {
         if self.official_exercises {
             return EMBEDDED_FILES
@@ -384,8 +331,8 @@ impl AppState {
             })
     }
 
-    /// Official exercises: Dump the solution file from the binary and return its path.
-    /// Community exercises: Check if a solution file exists and return its path in that case.
+    /// Official exercises: Dump the solution file form the binary and return its path.
+    /// Third-party exercises: Check if a solution file exists and return its path in that case.
     pub fn current_solution_path(&self) -> Result<Option<String>> {
         if cfg!(debug_assertions) {
             return Ok(None);
@@ -408,125 +355,62 @@ impl AppState {
         }
     }
 
-    fn check_all_exercises_impl(&mut self, stdout: &mut StdoutLock) -> Result<Option<usize>> {
-        let term_width = terminal::size()
-            .context("Failed to get the terminal size")?
-            .0;
-        let mut progress_visualizer = CheckProgressVisualizer::build(stdout, term_width)?;
+    // Return the exercise index of the first pending exercise found.
+    fn check_all_exercises(&self, stdout: &mut StdoutLock) -> Result<Option<usize>> {
+        stdout.write_all(RERUNNING_ALL_EXERCISES_MSG)?;
+        let n_exercises = self.exercises.len();
 
-        let next_exercise_ind = AtomicUsize::new(0);
-        let mut progresses = vec![CheckProgress::None; self.exercises.len()];
+        let status = thread::scope(|s| {
+            let handles = self
+                .exercises
+                .iter()
+                .map(|exercise| s.spawn(|| exercise.run_exercise(None, &self.cmd_runner)))
+                .collect::<Vec<_>>();
 
-        thread::scope(|s| {
-            let (exercise_progress_sender, exercise_progress_receiver) = mpsc::channel();
-            let n_threads = thread::available_parallelism()
-                .map_or(DEFAULT_CHECK_PARALLELISM, |count| count.get());
+            for (exercise_ind, handle) in handles.into_iter().enumerate() {
+                write!(stdout, "\rProgress: {exercise_ind}/{n_exercises}")?;
+                stdout.flush()?;
 
-            for _ in 0..n_threads {
-                let exercise_progress_sender = exercise_progress_sender.clone();
-                let next_exercise_ind = &next_exercise_ind;
-                let slf = &self;
-                thread::Builder::new()
-                    .spawn_scoped(s, move || {
-                        loop {
-                            let exercise_ind = next_exercise_ind.fetch_add(1, Relaxed);
-                            let Some(exercise) = slf.exercises.get(exercise_ind) else {
-                                // No more exercises.
-                                break;
-                            };
+                let Ok(success) = handle.join().unwrap() else {
+                    return Ok(AllExercisesCheck::CheckedUntil(exercise_ind));
+                };
 
-                            if exercise_progress_sender
-                                .send((exercise_ind, CheckProgress::Checking))
-                                .is_err()
-                            {
-                                break;
-                            };
-
-                            let success = exercise.run_exercise(None, &slf.cmd_runner);
-                            let progress = match success {
-                                Ok(true) => CheckProgress::Done,
-                                Ok(false) => CheckProgress::Pending,
-                                Err(_) => CheckProgress::None,
-                            };
-
-                            if exercise_progress_sender
-                                .send((exercise_ind, progress))
-                                .is_err()
-                            {
-                                break;
-                            }
-                        }
-                    })
-                    .context("Failed to spawn a thread to check all exercises")?;
+                if !success {
+                    return Ok(AllExercisesCheck::Pending(exercise_ind));
+                }
             }
 
-            // Drop this sender to detect when the last thread is done.
-            drop(exercise_progress_sender);
-
-            while let Ok((exercise_ind, progress)) = exercise_progress_receiver.recv() {
-                progresses[exercise_ind] = progress;
-                progress_visualizer.update(&progresses)?;
-            }
-
-            Ok::<_, Error>(())
+            Ok::<_, io::Error>(AllExercisesCheck::AllDone)
         })?;
 
-        let mut first_pending_exercise_ind = None;
-        for exercise_ind in 0..progresses.len() {
-            match progresses[exercise_ind] {
-                CheckProgress::Done => {
-                    self.set_status(exercise_ind, true)?;
-                }
-                CheckProgress::Pending => {
-                    self.set_status(exercise_ind, false)?;
-                    if first_pending_exercise_ind.is_none() {
-                        first_pending_exercise_ind = Some(exercise_ind);
-                    }
-                }
-                CheckProgress::None | CheckProgress::Checking => {
-                    // If we got an error while checking all exercises in parallel,
-                    // it could be because we exceeded the limit of open file descriptors.
-                    // Therefore, try running exercises with errors sequentially.
-                    progresses[exercise_ind] = CheckProgress::Checking;
-                    progress_visualizer.update(&progresses)?;
+        let mut exercise_ind = match status {
+            AllExercisesCheck::Pending(exercise_ind) => return Ok(Some(exercise_ind)),
+            AllExercisesCheck::AllDone => return Ok(None),
+            AllExercisesCheck::CheckedUntil(ind) => ind,
+        };
 
-                    let exercise = &self.exercises[exercise_ind];
-                    let success = exercise.run_exercise(None, &self.cmd_runner)?;
-                    if success {
-                        progresses[exercise_ind] = CheckProgress::Done;
-                    } else {
-                        progresses[exercise_ind] = CheckProgress::Pending;
-                        if first_pending_exercise_ind.is_none() {
-                            first_pending_exercise_ind = Some(exercise_ind);
-                        }
-                    }
-                    self.set_status(exercise_ind, success)?;
-                    progress_visualizer.update(&progresses)?;
-                }
+        // We got an error while checking all exercises in parallel.
+        // This could be because we exceeded the limit of open file descriptors.
+        // Therefore, try to continue the check sequentially.
+        for exercise in &self.exercises[exercise_ind..] {
+            write!(stdout, "\rProgress: {exercise_ind}/{n_exercises}")?;
+            stdout.flush()?;
+
+            let success = exercise.run_exercise(None, &self.cmd_runner)?;
+            if !success {
+                return Ok(Some(exercise_ind));
             }
+
+            exercise_ind += 1;
         }
 
-        self.write()?;
-
-        Ok(first_pending_exercise_ind)
-    }
-
-    // Return the exercise index of the first pending exercise found.
-    pub fn check_all_exercises(&mut self, stdout: &mut StdoutLock) -> Result<Option<usize>> {
-        stdout.queue(cursor::Hide)?;
-        let res = self.check_all_exercises_impl(stdout);
-        stdout.queue(cursor::Show)?;
-
-        res
+        Ok(None)
     }
 
     /// Mark the current exercise as done and move on to the next pending exercise if one exists.
     /// If all exercises are marked as done, run all of them to make sure that they are actually
     /// done. If an exercise which is marked as done fails, mark it as pending and continue on it.
-    pub fn done_current_exercise<const CLEAR_BEFORE_FINAL_CHECK: bool>(
-        &mut self,
-        stdout: &mut StdoutLock,
-    ) -> Result<ExercisesProgress> {
+    pub fn done_current_exercise(&mut self, stdout: &mut StdoutLock) -> Result<ExercisesProgress> {
         let exercise = &mut self.exercises[self.current_exercise_ind];
         if !exercise.done {
             exercise.done = true;
@@ -538,24 +422,20 @@ impl AppState {
             return Ok(ExercisesProgress::NewPending);
         }
 
-        if CLEAR_BEFORE_FINAL_CHECK {
-            clear_terminal(stdout)?;
-        } else {
-            stdout.write_all(b"\n")?;
-        }
-
-        if let Some(first_pending_exercise_ind) = self.check_all_exercises(stdout)? {
-            self.set_current_exercise_ind(first_pending_exercise_ind)?;
+        if let Some(pending_exercise_ind) = self.check_all_exercises(stdout)? {
+            stdout.write_all(b"\n\n")?;
 
+            self.current_exercise_ind = pending_exercise_ind;
+            self.exercises[pending_exercise_ind].done = false;
+            // All exercises were marked as done.
+            self.n_done -= 1;
+            self.write()?;
             return Ok(ExercisesProgress::NewPending);
         }
 
-        self.render_final_message(stdout)?;
+        // Write that the last exercise is done.
+        self.write()?;
 
-        Ok(ExercisesProgress::AllDone)
-    }
-
-    pub fn render_final_message(&self, stdout: &mut StdoutLock) -> Result<()> {
         clear_terminal(stdout)?;
         stdout.write_all(FENISH_LINE.as_bytes())?;
 
@@ -565,12 +445,16 @@ impl AppState {
             stdout.write_all(b"\n")?;
         }
 
-        Ok(())
+        Ok(ExercisesProgress::AllDone)
     }
 }
 
 const BAD_INDEX_ERR: &str = "The current exercise index is higher than the number of exercises";
 const STATE_FILE_HEADER: &[u8] = b"DON'T EDIT THIS FILE!\n\n";
+const RERUNNING_ALL_EXERCISES_MSG: &[u8] = b"
+All exercises seem to be done.
+Recompiling and running all exercises to make sure that all of them are actually done.
+";
 const FENISH_LINE: &str = "+----------------------------------------------------+
 |          You made it to the Fe-nish line!          |
 +--------------------------  ------------------------+
@@ -602,7 +486,6 @@ mod tests {
             dir: None,
             name: "0",
             path: "exercises/0.rs",
-            canonical_path: None,
             test: false,
             strict_clippy: false,
             hint: "",
@@ -621,7 +504,7 @@ mod tests {
             file_buf: Vec::new(),
             official_exercises: true,
             cmd_runner: CmdRunner::build().unwrap(),
-            emit_file_links: true,
+            vs_code: false,
         };
 
         let mut assert = |done: [bool; 3], expected: [Option<usize>; 3]| {

src/cargo_toml.rs

@@ -74,13 +74,13 @@ pub fn updated_cargo_toml(
     let (bins_start_ind, bins_end_ind) = bins_start_end_ind(current_cargo_toml)?;
 
     let mut updated_cargo_toml = Vec::with_capacity(BINS_BUFFER_CAPACITY);
-    updated_cargo_toml.extend_from_slice(&current_cargo_toml.as_bytes()[..bins_start_ind]);
+    updated_cargo_toml.extend_from_slice(current_cargo_toml[..bins_start_ind].as_bytes());
     append_bins(
         &mut updated_cargo_toml,
         exercise_infos,
         exercise_path_prefix,
     );
-    updated_cargo_toml.extend_from_slice(&current_cargo_toml.as_bytes()[bins_end_ind..]);
+    updated_cargo_toml.extend_from_slice(current_cargo_toml[bins_end_ind..].as_bytes());
 
     Ok(updated_cargo_toml)
 }
@@ -134,14 +134,7 @@ mod tests {
         );
 
         assert_eq!(
-            updated_cargo_toml(
-                &exercise_infos,
-                "abc\n\
-                 bin = [xxx]\n\
-                 123",
-                b"../"
-            )
-            .unwrap(),
+            updated_cargo_toml(&exercise_infos, "abc\nbin = [xxx]\n123", b"../").unwrap(),
             br#"abc
 bin = [
   { name = "1", path = "../exercises/1.rs" },

src/cmd.rs

@@ -1,7 +1,7 @@
-use anyhow::{Context, Result, bail};
+use anyhow::{bail, Context, Result};
 use serde::Deserialize;
 use std::{
-    io::{Read, pipe},
+    io::Read,
     path::PathBuf,
     process::{Command, Stdio},
 };
@@ -17,7 +17,7 @@ fn run_cmd(mut cmd: Command, description: &str, output: Option<&mut Vec<u8>>) ->
     };
 
     let mut handle = if let Some(output) = output {
-        let (mut reader, writer) = pipe().with_context(|| {
+        let (mut reader, writer) = os_pipe::pipe().with_context(|| {
             format!("Failed to create a pipe to run the command `{description}``")
         })?;
 
@@ -125,7 +125,7 @@ pub struct CargoSubcommand<'out> {
     output: Option<&'out mut Vec<u8>>,
 }
 
-impl CargoSubcommand<'_> {
+impl<'out> CargoSubcommand<'out> {
     #[inline]
     pub fn args<'arg, I>(&mut self, args: I) -> &mut Self
     where

src/collections.rs

@@ -0,0 +1,10 @@
+use ahash::AHasher;
+use std::hash::BuildHasherDefault;
+
+/// DOS attacks aren't a concern for Rustlings. Therefore, we use `ahash` with fixed seeds.
+pub type HashSet<T> = std::collections::HashSet<T, BuildHasherDefault<AHasher>>;
+
+#[inline]
+pub fn hash_set_with_capacity<T>(capacity: usize) -> HashSet<T> {
+    HashSet::with_capacity_and_hasher(capacity, BuildHasherDefault::<AHasher>::default())
+}

src/dev.rs

@@ -1,4 +1,4 @@
-use anyhow::{Context, Result, bail};
+use anyhow::{bail, Context, Result};
 use clap::Subcommand;
 use std::path::PathBuf;
 
@@ -8,7 +8,7 @@ mod update;
 
 #[derive(Subcommand)]
 pub enum DevCommands {
-    /// Create a new project for community exercises
+    /// Create a new project for third-party Rustlings exercises
     New {
         /// The path to create the project in
         path: PathBuf,

src/dev/check.rs

@@ -1,8 +1,7 @@
-use anyhow::{Context, Error, Result, anyhow, bail};
+use anyhow::{anyhow, bail, Context, Error, Result};
 use std::{
     cmp::Ordering,
-    collections::HashSet,
-    fs::{self, OpenOptions, read_dir},
+    fs::{self, read_dir, OpenOptions},
     io::{self, Read, Write},
     path::{Path, PathBuf},
     process::{Command, Stdio},
@@ -10,15 +9,14 @@ use std::{
 };
 
 use crate::{
-    CURRENT_FORMAT_VERSION,
-    cargo_toml::{BINS_BUFFER_CAPACITY, append_bins, bins_start_end_ind},
+    cargo_toml::{append_bins, bins_start_end_ind, BINS_BUFFER_CAPACITY},
     cmd::CmdRunner,
-    exercise::{OUTPUT_CAPACITY, RunnableExercise},
+    collections::{hash_set_with_capacity, HashSet},
+    exercise::{RunnableExercise, OUTPUT_CAPACITY},
     info_file::{ExerciseInfo, InfoFile},
-    term::ProgressCounter,
+    CURRENT_FORMAT_VERSION,
 };
 
-const MAX_N_EXERCISES: usize = 999;
 const MAX_EXERCISE_NAME_LEN: usize = 32;
 
 // Find a char that isn't allowed in the exercise's `name` or `dir`.
@@ -43,14 +41,10 @@ fn check_cargo_toml(
 
     if old_bins != new_bins {
         if cfg!(debug_assertions) {
-            bail!(
-                "The file `dev/Cargo.toml` is outdated. Run `cargo dev update` to update it. Then run `cargo run -- dev check` again"
-            );
+            bail!("The file `dev/Cargo.toml` is outdated. Please run `cargo run -- dev update` to update it. Then run `cargo run -- dev check` again");
         }
 
-        bail!(
-            "The file `Cargo.toml` is outdated. Run `rustlings dev update` to update it. Then run `rustlings dev check` again"
-        );
+        bail!("The file `Cargo.toml` is outdated. Please run `rustlings dev update` to update it. Then run `rustlings dev check` again");
     }
 
     Ok(())
@@ -58,8 +52,8 @@ fn check_cargo_toml(
 
 // Check the info of all exercises and return their paths in a set.
 fn check_info_file_exercises(info_file: &InfoFile) -> Result<HashSet<PathBuf>> {
-    let mut names = HashSet::with_capacity(info_file.exercises.len());
-    let mut paths = HashSet::with_capacity(info_file.exercises.len());
+    let mut names = hash_set_with_capacity(info_file.exercises.len());
+    let mut paths = hash_set_with_capacity(info_file.exercises.len());
 
     let mut file_buf = String::with_capacity(1 << 14);
     for exercise_info in &info_file.exercises {
@@ -68,9 +62,7 @@ fn check_info_file_exercises(info_file: &InfoFile) -> Result<HashSet<PathBuf>> {
             bail!("Found an empty exercise name in `info.toml`");
         }
         if name.len() > MAX_EXERCISE_NAME_LEN {
-            bail!(
-                "The length of the exercise name `{name}` is bigger than the maximum {MAX_EXERCISE_NAME_LEN}"
-            );
+            bail!("The length of the exercise name `{name}` is bigger than the maximum {MAX_EXERCISE_NAME_LEN}");
         }
         if let Some(c) = forbidden_char(name) {
             bail!("Char `{c}` in the exercise name `{name}` is not allowed");
@@ -86,9 +78,7 @@ fn check_info_file_exercises(info_file: &InfoFile) -> Result<HashSet<PathBuf>> {
         }
 
         if exercise_info.hint.trim_ascii().is_empty() {
-            bail!(
-                "The exercise `{name}` has an empty hint. Please provide a hint or at least tell the user why a hint isn't needed for this exercise"
-            );
+            bail!("The exercise `{name}` has an empty hint. Please provide a hint or at least tell the user why a hint isn't needed for this exercise");
         }
 
         if !names.insert(name) {
@@ -105,30 +95,20 @@ fn check_info_file_exercises(info_file: &InfoFile) -> Result<HashSet<PathBuf>> {
             .with_context(|| format!("Failed to read the file {path}"))?;
 
         if !file_buf.contains("fn main()") {
-            bail!(
-                "The `main` function is missing in the file `{path}`.\n\
-                 Create at least an empty `main` function to avoid language server errors"
-            );
+            bail!("The `main` function is missing in the file `{path}`.\nCreate at least an empty `main` function to avoid language server errors");
         }
 
         if !file_buf.contains("// TODO") {
-            bail!(
-                "Didn't find any `// TODO` comment in the file `{path}`.\n\
-                 You need to have at least one such comment to guide the user."
-            );
+            bail!("Didn't find any `// TODO` comment in the file `{path}`.\nYou need to have at least one such comment to guide the user.");
         }
 
         let contains_tests = file_buf.contains("#[test]\n");
         if exercise_info.test {
             if !contains_tests {
-                bail!(
-                    "The file `{path}` doesn't contain any tests. If you don't want to add tests to this exercise, set `test = false` for this exercise in the `info.toml` file"
-                );
+                bail!("The file `{path}` doesn't contain any tests. If you don't want to add tests to this exercise, set `test = false` for this exercise in the `info.toml` file");
             }
         } else if contains_tests {
-            bail!(
-                "The file `{path}` contains tests annotated with `#[test]` but the exercise `{name}` has `test = false` in the `info.toml` file"
-            );
+            bail!("The file `{path}` contains tests annotated with `#[test]` but the exercise `{name}` has `test = false` in the `info.toml` file");
         }
 
         file_buf.clear();
@@ -144,10 +124,7 @@ fn check_info_file_exercises(info_file: &InfoFile) -> Result<HashSet<PathBuf>> {
 // Only one level of directory nesting is allowed.
 fn check_unexpected_files(dir: &str, allowed_rust_files: &HashSet<PathBuf>) -> Result<()> {
     let unexpected_file = |path: &Path| {
-        anyhow!(
-            "Found the file `{}`. Only `README.md` and Rust files related to an exercise in `info.toml` are allowed in the `{dir}` directory",
-            path.display()
-        )
+        anyhow!("Found the file `{}`. Only `README.md` and Rust files related to an exercise in `info.toml` are allowed in the `{dir}` directory", path.display())
     };
 
     for entry in read_dir(dir).with_context(|| format!("Failed to open the `{dir}` directory"))? {
@@ -176,10 +153,7 @@ fn check_unexpected_files(dir: &str, allowed_rust_files: &HashSet<PathBuf>) -> R
             let path = entry.path();
 
             if !entry.file_type().unwrap().is_file() {
-                bail!(
-                    "Found `{}` but expected only files. Only one level of exercise nesting is allowed",
-                    path.display()
-                );
+                bail!("Found `{}` but expected only files. Only one level of exercise nesting is allowed", path.display());
             }
 
             let file_name = path.file_name().unwrap();
@@ -211,55 +185,48 @@ fn check_exercises_unsolved(
                 return None;
             }
 
-            Some(
-                thread::Builder::new()
-                    .spawn(|| exercise_info.run_exercise(None, cmd_runner))
-                    .map(|handle| (exercise_info.name.as_str(), handle)),
-            )
+            Some((
+                exercise_info.name.as_str(),
+                thread::spawn(|| exercise_info.run_exercise(None, cmd_runner)),
+            ))
         })
-        .collect::<Result<Vec<_>, _>>()
-        .context("Failed to spawn a thread to check if an exercise is already solved")?;
+        .collect::<Vec<_>>();
 
-    let mut progress_counter = ProgressCounter::new(&mut stdout, handles.len())?;
+    let n_handles = handles.len();
+    write!(stdout, "Progress: 0/{n_handles}")?;
+    stdout.flush()?;
+    let mut handle_num = 1;
 
     for (exercise_name, handle) in handles {
         let Ok(result) = handle.join() else {
-            bail!("Panic while trying to run the exercise {exercise_name}");
+            bail!("Panic while trying to run the exericse {exercise_name}");
         };
 
         match result {
             Ok(true) => {
-                bail!(
-                    "The exercise {exercise_name} is already solved.\n\
-                     {SKIP_CHECK_UNSOLVED_HINT}",
-                )
+                bail!("The exercise {exercise_name} is already solved.\n{SKIP_CHECK_UNSOLVED_HINT}",)
             }
             Ok(false) => (),
             Err(e) => return Err(e),
         }
 
-        progress_counter.increment()?;
+        write!(stdout, "\rProgress: {handle_num}/{n_handles}")?;
+        stdout.flush()?;
+        handle_num += 1;
     }
+    stdout.write_all(b"\n")?;
 
     Ok(())
 }
 
 fn check_exercises(info_file: &'static InfoFile, cmd_runner: &'static CmdRunner) -> Result<()> {
     match info_file.format_version.cmp(&CURRENT_FORMAT_VERSION) {
-        Ordering::Less => bail!(
-            "`format_version` < {CURRENT_FORMAT_VERSION} (supported version)\n\
-             Please migrate to the latest format version"
-        ),
-        Ordering::Greater => bail!(
-            "`format_version` > {CURRENT_FORMAT_VERSION} (supported version)\n\
-             Try updating the Rustlings program"
-        ),
+        Ordering::Less => bail!("`format_version` < {CURRENT_FORMAT_VERSION} (supported version)\nPlease migrate to the latest format version"),
+        Ordering::Greater => bail!("`format_version` > {CURRENT_FORMAT_VERSION} (supported version)\nTry updating the Rustlings program"),
         Ordering::Equal => (),
     }
 
-    let handle = thread::Builder::new()
-        .spawn(move || check_exercises_unsolved(info_file, cmd_runner))
-        .context("Failed to spawn a thread to check if any exercise is already solved")?;
+    let handle = thread::spawn(move || check_exercises_unsolved(info_file, cmd_runner));
 
     let info_file_paths = check_info_file_exercises(info_file)?;
     check_unexpected_files("exercises", &info_file_paths)?;
@@ -286,7 +253,7 @@ fn check_solutions(
         .exercises
         .iter()
         .map(|exercise_info| {
-            thread::Builder::new().spawn(move || {
+            thread::spawn(move || {
                 let sol_path = exercise_info.sol_path();
                 if !Path::new(&sol_path).exists() {
                     if require_solutions {
@@ -307,25 +274,27 @@ fn check_solutions(
                 }
             })
         })
-        .collect::<Result<Vec<_>, _>>()
-        .context("Failed to spawn a thread to check a solution")?;
+        .collect::<Vec<_>>();
 
-    let mut sol_paths = HashSet::with_capacity(info_file.exercises.len());
+    let mut sol_paths = hash_set_with_capacity(info_file.exercises.len());
     let mut fmt_cmd = Command::new("rustfmt");
     fmt_cmd
         .arg("--check")
         .arg("--edition")
-        .arg("2024")
+        .arg("2021")
         .arg("--color")
         .arg("always")
         .stdin(Stdio::null());
 
-    let mut progress_counter = ProgressCounter::new(&mut stdout, handles.len())?;
+    let n_handles = handles.len();
+    write!(stdout, "Progress: 0/{n_handles}")?;
+    stdout.flush()?;
+    let mut handle_num = 1;
 
     for (exercise_info, handle) in info_file.exercises.iter().zip(handles) {
         let Ok(check_result) = handle.join() else {
             bail!(
-                "Panic while trying to run the solution of the exercise {}",
+                "Panic while trying to run the solution of the exericse {}",
                 exercise_info.name,
             );
         };
@@ -337,7 +306,7 @@ fn check_solutions(
             }
             SolutionCheck::MissingOptional => (),
             SolutionCheck::RunFailure { output } => {
-                drop(progress_counter);
+                stdout.write_all(b"\n\n")?;
                 stdout.write_all(&output)?;
                 bail!(
                     "Running the solution of the exercise {} failed with the error above",
@@ -347,21 +316,18 @@ fn check_solutions(
             SolutionCheck::Err(e) => return Err(e),
         }
 
-        progress_counter.increment()?;
+        write!(stdout, "\rProgress: {handle_num}/{n_handles}")?;
+        stdout.flush()?;
+        handle_num += 1;
     }
+    stdout.write_all(b"\n")?;
 
-    let n_solutions = sol_paths.len();
-    let handle = thread::Builder::new()
-        .spawn(move || check_unexpected_files("solutions", &sol_paths))
-        .context(
-            "Failed to spawn a thread to check for unexpected files in the solutions directory",
-        )?;
+    let handle = thread::spawn(move || check_unexpected_files("solutions", &sol_paths));
 
-    if n_solutions > 0
-        && !fmt_cmd
-            .status()
-            .context("Failed to run `rustfmt` on all solution files")?
-            .success()
+    if !fmt_cmd
+        .status()
+        .context("Failed to run `rustfmt` on all solution files")?
+        .success()
     {
         bail!("Some solutions aren't formatted. Run `rustfmt` on them");
     }
@@ -372,12 +338,8 @@ fn check_solutions(
 pub fn check(require_solutions: bool) -> Result<()> {
     let info_file = InfoFile::parse()?;
 
-    if info_file.exercises.len() > MAX_N_EXERCISES {
-        bail!("The maximum number of exercises is {MAX_N_EXERCISES}");
-    }
-
     if cfg!(debug_assertions) {
-        // A hack to make `cargo dev check` work when developing Rustlings.
+        // A hack to make `cargo run -- dev check` work when developing Rustlings.
         check_cargo_toml(&info_file.exercises, "dev/Cargo.toml", b"../")?;
     } else {
         check_cargo_toml(&info_file.exercises, "Cargo.toml", b"")?;

src/dev/new.rs

@@ -1,4 +1,4 @@
-use anyhow::{Context, Result, bail};
+use anyhow::{bail, Context, Result};
 use std::{
     env::set_current_dir,
     fs::{self, create_dir},
@@ -6,7 +6,7 @@ use std::{
     process::Command,
 };
 
-use crate::{CURRENT_FORMAT_VERSION, init::RUST_ANALYZER_TOML};
+use crate::CURRENT_FORMAT_VERSION;
 
 // Create a directory relative to the current directory and print its path.
 fn create_rel_dir(dir_name: &str, current_dir: &str) -> Result<()> {
@@ -55,17 +55,13 @@ pub fn new(path: &Path, no_git: bool) -> Result<()> {
     write_rel_file(
         "info.toml",
         &dir_path_str,
-        format!(
-            "{INFO_FILE_BEFORE_FORMAT_VERSION}{CURRENT_FORMAT_VERSION}{INFO_FILE_AFTER_FORMAT_VERSION}"
-        ),
+        format!("{INFO_FILE_BEFORE_FORMAT_VERSION}{CURRENT_FORMAT_VERSION}{INFO_FILE_AFTER_FORMAT_VERSION}"),
     )?;
 
     write_rel_file("Cargo.toml", &dir_path_str, CARGO_TOML)?;
 
     write_rel_file("README.md", &dir_path_str, README)?;
 
-    write_rel_file("rust-analyzer.toml", &dir_path_str, RUST_ANALYZER_TOML)?;
-
     create_rel_dir(".vscode", &dir_path_str)?;
     write_rel_file(
         ".vscode/extensions.json",
@@ -78,17 +74,18 @@ pub fn new(path: &Path, no_git: bool) -> Result<()> {
     Ok(())
 }
 
-pub const GITIGNORE: &[u8] = b"Cargo.lock
+pub const GITIGNORE: &[u8] = b".rustlings-state.txt
+Cargo.lock
 target/
 .vscode/
 !.vscode/extensions.json
 ";
 
 const INFO_FILE_BEFORE_FORMAT_VERSION: &str =
-    "# The format version is an indicator of the compatibility of community exercises with the
+    "# The format version is an indicator of the compatibility of third-party exercises with the
 # Rustlings program.
 # The format version is not the same as the version of the Rustlings program.
-# In case Rustlings makes an unavoidable breaking change to the expected format of community
+# In case Rustlings makes an unavoidable breaking change to the expected format of third-party
 # exercises, you would need to raise this version and adapt to the new format.
 # Otherwise, the newest version of the Rustlings program won't be able to run these exercises.
 format_version = ";
@@ -96,7 +93,7 @@ format_version = ";
 const INFO_FILE_AFTER_FORMAT_VERSION: &str = r#"
 
 # Optional multi-line message to be shown to users when just starting with the exercises.
-welcome_message = """Welcome to these community Rustlings exercises."""
+welcome_message = """Welcome to these third-party Rustlings exercises."""
 
 # Optional multi-line message to be shown to users after finishing all exercises.
 final_message = """We hope that you found the exercises helpful :D"""
@@ -131,7 +128,7 @@ bin = []
 
 [package]
 name = "exercises"
-edition = "2024"
+edition = "2021"
 # Don't publish the exercises on crates.io!
 publish = false
 
@@ -140,7 +137,7 @@ publish = false
 
 const README: &str = "# Rustlings 🦀
 
-Welcome to these community Rustlings exercises 😃
+Welcome to these third-party Rustlings exercises 😃
 
 First, [install Rustlings using the official instructions](https://github.com/rust-lang/rustlings) ✅
 

src/dev/update.rs

@@ -28,7 +28,7 @@ pub fn update() -> Result<()> {
     let info_file = InfoFile::parse()?;
 
     if cfg!(debug_assertions) {
-        // A hack to make `cargo dev update` work when developing Rustlings.
+        // A hack to make `cargo run -- dev update` work when developing Rustlings.
         update_cargo_toml(&info_file.exercises, "dev/Cargo.toml", b"../")
             .context("Failed to update the file `dev/Cargo.toml`")?;
 

src/embedded.rs

@@ -1,7 +1,7 @@
 use anyhow::{Context, Error, Result};
 use std::{
-    fs::{self, create_dir},
-    io,
+    fs::{create_dir, OpenOptions},
+    io::{self, Write},
 };
 
 use crate::info_file::ExerciseInfo;
@@ -9,6 +9,29 @@ use crate::info_file::ExerciseInfo;
 /// Contains all embedded files.
 pub static EMBEDDED_FILES: EmbeddedFiles = rustlings_macros::include_files!();
 
+#[derive(Clone, Copy)]
+pub enum WriteStrategy {
+    IfNotExists,
+    Overwrite,
+}
+
+impl WriteStrategy {
+    fn write(self, path: &str, content: &[u8]) -> Result<()> {
+        let file = match self {
+            Self::IfNotExists => OpenOptions::new().create_new(true).write(true).open(path),
+            Self::Overwrite => OpenOptions::new()
+                .create(true)
+                .write(true)
+                .truncate(true)
+                .open(path),
+        };
+
+        file.with_context(|| format!("Failed to open the file `{path}` in write mode"))?
+            .write_all(content)
+            .with_context(|| format!("Failed to write the file {path}"))
+    }
+}
+
 // Files related to one exercise.
 struct ExerciseFiles {
     // The content of the exercise file.
@@ -19,16 +42,6 @@ struct ExerciseFiles {
     dir_ind: usize,
 }
 
-fn create_dir_if_not_exists(path: &str) -> Result<()> {
-    if let Err(e) = create_dir(path)
-        && e.kind() != io::ErrorKind::AlreadyExists
-    {
-        return Err(Error::from(e).context(format!("Failed to create the directory {path}")));
-    }
-
-    Ok(())
-}
-
 // A directory in the `exercises/` directory.
 pub struct ExerciseDir {
     pub name: &'static str,
@@ -42,13 +55,21 @@ impl ExerciseDir {
         let mut dir_path = String::with_capacity(20 + self.name.len());
         dir_path.push_str("exercises/");
         dir_path.push_str(self.name);
-        create_dir_if_not_exists(&dir_path)?;
+
+        if let Err(e) = create_dir(&dir_path) {
+            if e.kind() == io::ErrorKind::AlreadyExists {
+                return Ok(());
+            }
+
+            return Err(
+                Error::from(e).context(format!("Failed to create the directory {dir_path}"))
+            );
+        }
 
         let mut readme_path = dir_path;
         readme_path.push_str("/README.md");
 
-        fs::write(&readme_path, self.readme)
-            .with_context(|| format!("Failed to write the file {readme_path}"))
+        WriteStrategy::Overwrite.write(&readme_path, self.readme)
     }
 }
 
@@ -65,31 +86,17 @@ impl EmbeddedFiles {
     pub fn init_exercises_dir(&self, exercise_infos: &[ExerciseInfo]) -> Result<()> {
         create_dir("exercises").context("Failed to create the directory `exercises`")?;
 
-        fs::write(
+        WriteStrategy::IfNotExists.write(
             "exercises/README.md",
             include_bytes!("../exercises/README.md"),
-        )
-        .context("Failed to write the file exercises/README.md")?;
+        )?;
 
         for dir in self.exercise_dirs {
             dir.init_on_disk()?;
         }
 
-        let mut exercise_path = String::with_capacity(64);
-        let prefix = "exercises/";
-        exercise_path.push_str(prefix);
-
         for (exercise_info, exercise_files) in exercise_infos.iter().zip(self.exercise_files) {
-            let dir = &self.exercise_dirs[exercise_files.dir_ind];
-
-            exercise_path.truncate(prefix.len());
-            exercise_path.push_str(dir.name);
-            exercise_path.push('/');
-            exercise_path.push_str(&exercise_info.name);
-            exercise_path.push_str(".rs");
-
-            fs::write(&exercise_path, exercise_files.exercise)
-                .with_context(|| format!("Failed to write the exercise file {exercise_path}"))?;
+            WriteStrategy::IfNotExists.write(&exercise_info.path(), exercise_files.exercise)?;
         }
 
         Ok(())
@@ -100,8 +107,7 @@ impl EmbeddedFiles {
         let dir = &self.exercise_dirs[exercise_files.dir_ind];
 
         dir.init_on_disk()?;
-        fs::write(path, exercise_files.exercise)
-            .with_context(|| format!("Failed to write the exercise file {path}"))
+        WriteStrategy::Overwrite.write(path, exercise_files.exercise)
     }
 
     /// Write the solution file to disk and return its path.
@@ -110,25 +116,19 @@ impl EmbeddedFiles {
         exercise_ind: usize,
         exercise_name: &str,
     ) -> Result<String> {
-        create_dir_if_not_exists("solutions")?;
-
         let exercise_files = &self.exercise_files[exercise_ind];
         let dir = &self.exercise_dirs[exercise_files.dir_ind];
 
         // 14 = 10 + 1 + 3
         // solutions/ + / + .rs
-        let mut dir_path = String::with_capacity(14 + dir.name.len() + exercise_name.len());
-        dir_path.push_str("solutions/");
-        dir_path.push_str(dir.name);
-        create_dir_if_not_exists(&dir_path)?;
-
-        let mut solution_path = dir_path;
+        let mut solution_path = String::with_capacity(14 + dir.name.len() + exercise_name.len());
+        solution_path.push_str("solutions/");
+        solution_path.push_str(dir.name);
         solution_path.push('/');
         solution_path.push_str(exercise_name);
         solution_path.push_str(".rs");
 
-        fs::write(&solution_path, exercise_files.solution)
-            .with_context(|| format!("Failed to write the solution file {solution_path}"))?;
+        WriteStrategy::Overwrite.write(&solution_path, exercise_files.solution)?;
 
         Ok(solution_path)
     }
@@ -152,7 +152,7 @@ mod tests {
 
     #[test]
     fn dirs() {
-        let exercises = toml::de::from_str::<InfoFile>(EMBEDDED_FILES.info_file)
+        let exercises = toml_edit::de::from_str::<InfoFile>(EMBEDDED_FILES.info_file)
             .expect("Failed to parse `info.toml`")
             .exercises;
 

src/exercise.rs

@@ -1,34 +1,24 @@
 use anyhow::Result;
 use crossterm::{
-    QueueableCommand,
     style::{Attribute, Color, ResetColor, SetAttribute, SetForegroundColor},
+    QueueableCommand,
 };
 use std::io::{self, StdoutLock, Write};
 
 use crate::{
     cmd::CmdRunner,
-    term::{self, CountedWrite, file_path, terminal_file_link, write_ansi},
+    term::{terminal_file_link, write_ansi},
 };
 
 /// The initial capacity of the output buffer.
 pub const OUTPUT_CAPACITY: usize = 1 << 14;
 
-pub fn solution_link_line(
-    stdout: &mut StdoutLock,
-    solution_path: &str,
-    emit_file_links: bool,
-) -> io::Result<()> {
+pub fn solution_link_line(stdout: &mut StdoutLock, solution_path: &str) -> io::Result<()> {
     stdout.queue(SetAttribute(Attribute::Bold))?;
     stdout.write_all(b"Solution")?;
     stdout.queue(ResetColor)?;
     stdout.write_all(b" for comparison: ")?;
-    file_path(stdout, Color::Cyan, |writer| {
-        if emit_file_links && let Some(canonical_path) = term::canonicalize(solution_path) {
-            terminal_file_link(writer, solution_path, &canonical_path)
-        } else {
-            writer.stdout().write_all(solution_path.as_bytes())
-        }
-    })?;
+    terminal_file_link(stdout, solution_path, Color::Cyan)?;
     stdout.write_all(b"\n")
 }
 
@@ -48,17 +38,17 @@ fn run_bin(
 
     let success = cmd_runner.run_debug_bin(bin_name, output.as_deref_mut())?;
 
-    if let Some(output) = output
-        && !success
-    {
-        // This output is important to show the user that something went wrong.
-        // Otherwise, calling something like `exit(1)` in an exercise without further output
-        // leaves the user confused about why the exercise isn't done yet.
-        write_ansi(output, SetAttribute(Attribute::Bold));
-        write_ansi(output, SetForegroundColor(Color::Red));
-        output.extend_from_slice(b"The exercise didn't run successfully (nonzero exit code)");
-        write_ansi(output, ResetColor);
-        output.push(b'\n');
+    if let Some(output) = output {
+        if !success {
+            // This output is important to show the user that something went wrong.
+            // Otherwise, calling something like `exit(1)` in an exercise without further output
+            // leaves the user confused about why the exercise isn't done yet.
+            write_ansi(output, SetAttribute(Attribute::Bold));
+            write_ansi(output, SetForegroundColor(Color::Red));
+            output.extend_from_slice(b"The exercise didn't run successfully (nonzero exit code)");
+            write_ansi(output, ResetColor);
+            output.push(b'\n');
+        }
     }
 
     Ok(success)
@@ -70,29 +60,12 @@ pub struct Exercise {
     pub name: &'static str,
     /// Path of the exercise file starting with the `exercises/` directory.
     pub path: &'static str,
-    pub canonical_path: Option<String>,
     pub test: bool,
     pub strict_clippy: bool,
     pub hint: &'static str,
     pub done: bool,
 }
 
-impl Exercise {
-    pub fn terminal_file_link<'a>(
-        &self,
-        writer: &mut impl CountedWrite<'a>,
-        emit_file_links: bool,
-    ) -> io::Result<()> {
-        file_path(writer, Color::Blue, |writer| {
-            if emit_file_links && let Some(canonical_path) = self.canonical_path.as_deref() {
-                terminal_file_link(writer, self.path, canonical_path)
-            } else {
-                writer.write_str(self.path)
-            }
-        })
-    }
-}
-
 pub trait RunnableExercise {
     fn name(&self) -> &str;
     fn dir(&self) -> Option<&str>;
@@ -143,7 +116,7 @@ pub trait RunnableExercise {
 
         let mut clippy_cmd = cmd_runner.cargo("clippy", bin_name, output.as_deref_mut());
 
-        // `--profile test` is required to also check code with `#[cfg(test)]`.
+        // `--profile test` is required to also check code with `[cfg(test)]`.
         if FORCE_STRICT_CLIPPY || self.strict_clippy() {
             clippy_cmd.args(["--profile", "test", "--", "-D", "warnings"]);
         } else {

src/info_file.rs

@@ -1,4 +1,4 @@
-use anyhow::{Context, Error, Result, bail};
+use anyhow::{bail, Context, Error, Result};
 use serde::Deserialize;
 use std::{fs, io::ErrorKind};
 
@@ -79,7 +79,7 @@ impl RunnableExercise for ExerciseInfo {
 /// The deserialized `info.toml` file.
 #[derive(Deserialize)]
 pub struct InfoFile {
-    /// For possible breaking changes in the future for community exercises.
+    /// For possible breaking changes in the future for third-party exercises.
     pub format_version: u8,
     /// Shown to users when starting with the exercises.
     pub welcome_message: Option<String>,
@@ -91,15 +91,15 @@ pub struct InfoFile {
 
 impl InfoFile {
     /// Official exercises: Parse the embedded `info.toml` file.
-    /// Community exercises: Parse the `info.toml` file in the current directory.
+    /// Third-party exercises: Parse the `info.toml` file in the current directory.
     pub fn parse() -> Result<Self> {
         // Read a local `info.toml` if it exists.
         let slf = match fs::read_to_string("info.toml") {
-            Ok(file_content) => toml::de::from_str::<Self>(&file_content)
+            Ok(file_content) => toml_edit::de::from_str::<Self>(&file_content)
                 .context("Failed to parse the `info.toml` file")?,
             Err(e) => {
                 if e.kind() == ErrorKind::NotFound {
-                    return toml::de::from_str(EMBEDDED_FILES.info_file)
+                    return toml_edit::de::from_str(EMBEDDED_FILES.info_file)
                         .context("Failed to parse the embedded `info.toml` file");
                 }
 

src/init.rs

@@ -1,7 +1,7 @@
-use anyhow::{Context, Result, bail};
+use anyhow::{bail, Context, Result};
 use crossterm::{
-    QueueableCommand,
     style::{Attribute, Color, ResetColor, SetAttribute, SetForegroundColor},
+    QueueableCommand,
 };
 use serde::Deserialize;
 use std::{
@@ -35,27 +35,7 @@ pub fn init() -> Result<()> {
         .stdin(Stdio::null())
         .stderr(Stdio::null())
         .output()
-        .context(
-            "Failed to run the command `cargo locate-project …`\n\
-             Did you already install Rust?\n\
-             Try running `cargo --version` to diagnose the problem.",
-        )?;
-
-    if !Command::new("cargo")
-        .arg("clippy")
-        .arg("--version")
-        .stdin(Stdio::null())
-        .stdout(Stdio::null())
-        .stderr(Stdio::null())
-        .status()
-        .context("Failed to run the command `cargo clippy --version`")?
-        .success()
-    {
-        bail!(
-            "Clippy, the official Rust linter, is missing.\n\
-             Please install it first before initializing Rustlings."
-        )
-    }
+        .context(CARGO_LOCATE_PROJECT_ERR)?;
 
     let mut stdout = io::stdout().lock();
     let mut init_git = true;
@@ -74,17 +54,13 @@ pub fn init() -> Result<()> {
 
         let workspace_manifest_content = fs::read_to_string(&workspace_manifest)
             .with_context(|| format!("Failed to read the file {}", workspace_manifest.display()))?;
-        if !workspace_manifest_content.contains("[workspace]")
+        if !workspace_manifest_content.contains("[workspace]\n")
             && !workspace_manifest_content.contains("workspace.")
         {
-            bail!(
-                "The current directory is already part of a Cargo project.\n\
-                 Please initialize Rustlings in a different directory"
-            );
+            bail!("The current directory is already part of a Cargo project.\nPlease initialize Rustlings in a different directory");
         }
 
-        stdout.write_all(b"This command will create the directory `rustlings/` as a member of this Cargo workspace.\n\
-                           Press ENTER to continue ")?;
+        stdout.write_all(b"This command will create the directory `rustlings/` as a member of this Cargo workspace.\nPress ENTER to continue ")?;
         press_enter_prompt(&mut stdout)?;
 
         // Make sure "rustlings" is added to `workspace.members` by making
@@ -99,10 +75,7 @@ pub fn init() -> Result<()> {
             .stdout(Stdio::null())
             .status()?;
         if !status.success() {
-            bail!(
-                "Failed to initialize a new Cargo workspace member.\n\
-                 Please initialize Rustlings in a different directory"
-            );
+            bail!("Failed to initialize a new Cargo workspace member.\nPlease initialize Rustlings in a different directory");
         }
 
         stdout.write_all(b"The directory `rustlings` has been added to `workspace.members` in the `Cargo.toml` file of this Cargo workspace.\n")?;
@@ -110,8 +83,7 @@ pub fn init() -> Result<()> {
             .context("Failed to remove the temporary directory `rustlings/`")?;
         init_git = false;
     } else {
-        stdout.write_all(b"This command will create the directory `rustlings/` which will contain the exercises.\n\
-                           Press ENTER to continue ")?;
+        stdout.write_all(b"This command will create the directory `rustlings/` which will contain the exercises.\nPress ENTER to continue ")?;
         press_enter_prompt(&mut stdout)?;
     }
 
@@ -158,9 +130,6 @@ pub fn init() -> Result<()> {
     fs::write("Cargo.toml", updated_cargo_toml)
         .context("Failed to create the file `rustlings/Cargo.toml`")?;
 
-    fs::write("rust-analyzer.toml", RUST_ANALYZER_TOML)
-        .context("Failed to create the file `rustlings/rust-analyzer.toml`")?;
-
     fs::write(".gitignore", GITIGNORE)
         .context("Failed to create the file `rustlings/.gitignore`")?;
 
@@ -190,17 +159,16 @@ pub fn init() -> Result<()> {
     Ok(())
 }
 
+const CARGO_LOCATE_PROJECT_ERR: &str = "Failed to run the command `cargo locate-project …`
+Did you already install Rust?
+Try running `cargo --version` to diagnose the problem.";
+
 const INIT_SOLUTION_FILE: &[u8] = b"fn main() {
     // DON'T EDIT THIS SOLUTION FILE!
     // It will be automatically filled after you finish the exercise.
 }
 ";
 
-pub const RUST_ANALYZER_TOML: &[u8] = br#"check.command = "clippy"
-check.extraArgs = ["--profile", "test"]
-cargo.targetDir = true
-"#;
-
 const GITIGNORE: &[u8] = b"Cargo.lock
 target/
 .vscode/

src/list.rs

@@ -1,13 +1,14 @@
 use anyhow::{Context, Result};
 use crossterm::{
-    QueueableCommand, cursor,
+    cursor,
     event::{
         self, DisableMouseCapture, EnableMouseCapture, Event, KeyCode, KeyEventKind, MouseEventKind,
     },
     terminal::{
-        DisableLineWrap, EnableLineWrap, EnterAlternateScreen, LeaveAlternateScreen,
-        disable_raw_mode, enable_raw_mode,
+        disable_raw_mode, enable_raw_mode, DisableLineWrap, EnableLineWrap, EnterAlternateScreen,
+        LeaveAlternateScreen,
     },
+    QueueableCommand,
 };
 use std::io::{self, StdoutLock, Write};
 
@@ -19,8 +20,7 @@ mod scroll_state;
 mod state;
 
 fn handle_list(app_state: &mut AppState, stdout: &mut StdoutLock) -> Result<()> {
-    let mut list_state = ListState::build(app_state, stdout)?;
-    let mut is_searching = false;
+    let mut list_state = ListState::new(app_state, stdout)?;
 
     loop {
         match event::read().context("Failed to read terminal event")? {
@@ -32,27 +32,6 @@ fn handle_list(app_state: &mut AppState, stdout: &mut StdoutLock) -> Result<()>
 
                 list_state.message.clear();
 
-                if is_searching {
-                    match key.code {
-                        KeyCode::Esc | KeyCode::Enter => {
-                            is_searching = false;
-                            list_state.search_query.clear();
-                        }
-                        KeyCode::Char(c) => {
-                            list_state.search_query.push(c);
-                            list_state.apply_search_query();
-                        }
-                        KeyCode::Backspace => {
-                            list_state.search_query.pop();
-                            list_state.apply_search_query();
-                        }
-                        _ => continue,
-                    }
-
-                    list_state.draw(stdout)?;
-                    continue;
-                }
-
                 match key.code {
                     KeyCode::Char('q') => return Ok(()),
                     KeyCode::Down | KeyCode::Char('j') => list_state.select_next(),
@@ -71,15 +50,15 @@ fn handle_list(app_state: &mut AppState, stdout: &mut StdoutLock) -> Result<()>
                         }
                     }
                     KeyCode::Char('p') => {
-                        if list_state.filter() == Filter::Pending {
+                        let message = if list_state.filter() == Filter::Pending {
                             list_state.set_filter(Filter::None);
-                            list_state.message.push_str("Disabled filter PENDING");
+                            "Disabled filter PENDING"
                         } else {
                             list_state.set_filter(Filter::Pending);
-                            list_state.message.push_str(
-                                "Enabled filter PENDING │ Press p again to disable the filter",
-                            );
-                        }
+                            "Enabled filter PENDING │ Press p again to disable the filter"
+                        };
+
+                        list_state.message.push_str(message);
                     }
                     KeyCode::Char('r') => list_state.reset_selected()?,
                     KeyCode::Char('c') => {
@@ -87,10 +66,6 @@ fn handle_list(app_state: &mut AppState, stdout: &mut StdoutLock) -> Result<()>
                             return Ok(());
                         }
                     }
-                    KeyCode::Char('s' | '/') => {
-                        is_searching = true;
-                        list_state.apply_search_query();
-                    }
                     // Redraw to remove the message.
                     KeyCode::Esc => (),
                     _ => continue,

src/list/scroll_state.rs

@@ -46,7 +46,7 @@ impl ScrollState {
         self.selected
     }
 
-    pub fn set_selected(&mut self, selected: usize) {
+    fn set_selected(&mut self, selected: usize) {
         self.selected = Some(selected);
         self.update_offset();
     }

src/list/state.rs

@@ -1,11 +1,9 @@
 use anyhow::{Context, Result};
 use crossterm::{
-    QueueableCommand,
     cursor::{MoveTo, MoveToNextLine},
-    style::{
-        Attribute, Attributes, Color, ResetColor, SetAttribute, SetAttributes, SetForegroundColor,
-    },
+    style::{Attribute, Color, ResetColor, SetAttribute, SetBackgroundColor, SetForegroundColor},
     terminal::{self, BeginSynchronizedUpdate, Clear, ClearType, EndSynchronizedUpdate},
+    QueueableCommand,
 };
 use std::{
     fmt::Write as _,
@@ -15,15 +13,12 @@ use std::{
 use crate::{
     app_state::AppState,
     exercise::Exercise,
-    term::{CountedWrite, MaxLenWriter, progress_bar},
+    term::{progress_bar, terminal_file_link, CountedWrite, MaxLenWriter},
 };
 
 use super::scroll_state::ScrollState;
 
 const COL_SPACING: usize = 2;
-const SELECTED_ROW_ATTRIBUTES: Attributes = Attributes::none()
-    .with(Attribute::Reverse)
-    .with(Attribute::Bold);
 
 fn next_ln(stdout: &mut StdoutLock) -> io::Result<()> {
     stdout
@@ -42,53 +37,48 @@ pub enum Filter {
 pub struct ListState<'a> {
     /// Footer message to be displayed if not empty.
     pub message: String,
-    pub search_query: String,
     app_state: &'a mut AppState,
     scroll_state: ScrollState,
     name_col_padding: Vec<u8>,
-    path_col_padding: Vec<u8>,
     filter: Filter,
     term_width: u16,
     term_height: u16,
+    separator_line: Vec<u8>,
+    narrow_term: bool,
     show_footer: bool,
 }
 
 impl<'a> ListState<'a> {
-    pub fn build(app_state: &'a mut AppState, stdout: &mut StdoutLock) -> Result<Self> {
+    pub fn new(app_state: &'a mut AppState, stdout: &mut StdoutLock) -> io::Result<Self> {
         stdout.queue(Clear(ClearType::All))?;
 
         let name_col_title_len = 4;
-        let path_col_title_len = 4;
-        let (name_col_width, path_col_width) = app_state.exercises().iter().fold(
-            (name_col_title_len, path_col_title_len),
-            |(name_col_width, path_col_width), exercise| {
-                (
-                    name_col_width.max(exercise.name.len()),
-                    path_col_width.max(exercise.path.len()),
-                )
-            },
-        );
+        let name_col_width = app_state
+            .exercises()
+            .iter()
+            .map(|exercise| exercise.name.len())
+            .max()
+            .map_or(name_col_title_len, |max| max.max(name_col_title_len));
         let name_col_padding = vec![b' '; name_col_width + COL_SPACING];
-        let path_col_padding = vec![b' '; path_col_width];
 
         let filter = Filter::None;
         let n_rows_with_filter = app_state.exercises().len();
         let selected = app_state.current_exercise_ind();
 
-        let (width, height) = terminal::size().context("Failed to get the terminal size")?;
+        let (width, height) = terminal::size()?;
         let scroll_state = ScrollState::new(n_rows_with_filter, Some(selected), 5);
 
         let mut slf = Self {
             message: String::with_capacity(128),
-            search_query: String::new(),
             app_state,
             scroll_state,
             name_col_padding,
-            path_col_padding,
             filter,
             // Set by `set_term_size`
             term_width: 0,
             term_height: 0,
+            separator_line: Vec::new(),
+            narrow_term: false,
             show_footer: true,
         };
 
@@ -106,38 +96,25 @@ impl<'a> ListState<'a> {
             return;
         }
 
+        let wide_help_footer_width = 95;
+        // The help footer is shorter when nothing is selected.
+        self.narrow_term = width < wide_help_footer_width && self.scroll_state.selected().is_some();
+
         let header_height = 1;
-        // 1 progress bar, 2 footer message lines.
-        let footer_height = 3;
+        // 2 separator, 1 progress bar, 1-2 footer message.
+        let footer_height = 4 + u16::from(self.narrow_term);
         self.show_footer = height > header_height + footer_height;
 
+        if self.show_footer {
+            self.separator_line = "─".as_bytes().repeat(width as usize);
+        }
+
         self.scroll_state.set_max_n_rows_to_display(
             height.saturating_sub(header_height + u16::from(self.show_footer) * footer_height)
                 as usize,
         );
     }
 
-    fn draw_exercise_name(&self, writer: &mut MaxLenWriter, exercise: &Exercise) -> io::Result<()> {
-        if !self.search_query.is_empty()
-            && let Some((pre_highlight, highlight, post_highlight)) = exercise
-                .name
-                .find(&self.search_query)
-                .and_then(|ind| exercise.name.split_at_checked(ind))
-                .and_then(|(pre_highlight, rest)| {
-                    rest.split_at_checked(self.search_query.len())
-                        .map(|x| (pre_highlight, x.0, x.1))
-                })
-        {
-            writer.write_str(pre_highlight)?;
-            writer.stdout.queue(SetForegroundColor(Color::Magenta))?;
-            writer.write_str(highlight)?;
-            writer.stdout.queue(SetForegroundColor(Color::Reset))?;
-            return writer.write_str(post_highlight);
-        }
-
-        writer.write_str(exercise.name)
-    }
-
     fn draw_rows(
         &self,
         stdout: &mut StdoutLock,
@@ -154,12 +131,14 @@ impl<'a> ListState<'a> {
             let mut writer = MaxLenWriter::new(stdout, self.term_width as usize);
 
             if self.scroll_state.selected() == Some(row_offset + n_displayed_rows) {
+                writer.stdout.queue(SetBackgroundColor(Color::Rgb {
+                    r: 40,
+                    g: 40,
+                    b: 40,
+                }))?;
                 // The crab emoji has the width of two ascii chars.
                 writer.add_to_len(2);
                 writer.stdout.write_all("🦀".as_bytes())?;
-                writer
-                    .stdout
-                    .queue(SetAttributes(SELECTED_ROW_ATTRIBUTES))?;
             } else {
                 writer.write_ascii(b"  ")?;
             }
@@ -173,21 +152,24 @@ impl<'a> ListState<'a> {
 
             if exercise.done {
                 writer.stdout.queue(SetForegroundColor(Color::Green))?;
-                writer.write_ascii(b"DONE   ")?;
+                writer.write_ascii(b"DONE     ")?;
             } else {
                 writer.stdout.queue(SetForegroundColor(Color::Yellow))?;
-                writer.write_ascii(b"PENDING")?;
+                writer.write_ascii(b"PENDING  ")?;
             }
+
             writer.stdout.queue(SetForegroundColor(Color::Reset))?;
-            writer.write_ascii(b"  ")?;
-
-            self.draw_exercise_name(&mut writer, exercise)?;
 
+            writer.write_str(exercise.name)?;
             writer.write_ascii(&self.name_col_padding[exercise.name.len()..])?;
 
-            exercise.terminal_file_link(&mut writer, self.app_state.emit_file_links())?;
-
-            writer.write_ascii(&self.path_col_padding[exercise.path.len()..])?;
+            // The list links aren't shown correctly in VS Code on Windows.
+            // But VS Code shows its own links anyway.
+            if self.app_state.vs_code() {
+                writer.write_str(exercise.path)?;
+            } else {
+                terminal_file_link(&mut writer, exercise.path, Color::Blue)?;
+            }
 
             next_ln(stdout)?;
             stdout.queue(ResetColor)?;
@@ -226,6 +208,9 @@ impl<'a> ListState<'a> {
         }
 
         if self.show_footer {
+            stdout.write_all(&self.separator_line)?;
+            next_ln(stdout)?;
+
             progress_bar(
                 &mut MaxLenWriter::new(stdout, self.term_width as usize),
                 self.app_state.n_done(),
@@ -234,15 +219,22 @@ impl<'a> ListState<'a> {
             )?;
             next_ln(stdout)?;
 
+            stdout.write_all(&self.separator_line)?;
+            next_ln(stdout)?;
+
             let mut writer = MaxLenWriter::new(stdout, self.term_width as usize);
             if self.message.is_empty() {
                 // Help footer message
                 if self.scroll_state.selected().is_some() {
                     writer.write_str("↓/j ↑/k home/g end/G | <c>ontinue at | <r>eset exercise")?;
-                    next_ln(stdout)?;
-                    writer = MaxLenWriter::new(stdout, self.term_width as usize);
+                    if self.narrow_term {
+                        next_ln(stdout)?;
+                        writer = MaxLenWriter::new(stdout, self.term_width as usize);
 
-                    writer.write_ascii(b"<s>earch | filter ")?;
+                        writer.write_ascii(b"filter ")?;
+                    } else {
+                        writer.write_ascii(b" | filter ")?;
+                    }
                 } else {
                     // Nothing selected (and nothing shown), so only display filter and quit.
                     writer.write_ascii(b"filter ")?;
@@ -271,14 +263,17 @@ impl<'a> ListState<'a> {
                 }
 
                 writer.write_ascii(b" | <q>uit list")?;
+                next_ln(stdout)?;
             } else {
                 writer.stdout.queue(SetForegroundColor(Color::Magenta))?;
                 writer.write_str(&self.message)?;
                 stdout.queue(ResetColor)?;
                 next_ln(stdout)?;
-            }
 
-            next_ln(stdout)?;
+                if self.narrow_term {
+                    next_ln(stdout)?;
+                }
+            }
         }
 
         stdout.queue(EndSynchronizedUpdate)?.flush()
@@ -375,33 +370,6 @@ impl<'a> ListState<'a> {
         Ok(())
     }
 
-    pub fn apply_search_query(&mut self) {
-        self.message.push_str("search:");
-        self.message.push_str(&self.search_query);
-        self.message.push('|');
-
-        if self.search_query.is_empty() {
-            return;
-        }
-
-        let is_search_result = |exercise: &Exercise| exercise.name.contains(&self.search_query);
-        let mut iter = self.app_state.exercises().iter();
-        let ind = match self.filter {
-            Filter::None => iter.position(is_search_result),
-            Filter::Done => iter
-                .filter(|exercise| exercise.done)
-                .position(is_search_result),
-            Filter::Pending => iter
-                .filter(|exercise| !exercise.done)
-                .position(is_search_result),
-        };
-
-        match ind {
-            Some(exercise_ind) => self.scroll_state.set_selected(exercise_ind),
-            None => self.message.push_str(" (not found)"),
-        }
-    }
-
     // Return `true` if there was something to select.
     pub fn selected_to_current_exercise(&mut self) -> Result<bool> {
         let Some(selected) = self.scroll_state.selected() else {

src/main.rs

@@ -1,18 +1,19 @@
-use anyhow::{Context, Result, bail};
+use anyhow::{bail, Context, Result};
 use app_state::StateFileStatus;
 use clap::{Parser, Subcommand};
 use std::{
     io::{self, IsTerminal, Write},
     path::Path,
-    process::ExitCode,
+    process::exit,
 };
 use term::{clear_terminal, press_enter_prompt};
 
-use self::{app_state::AppState, dev::DevCommands, info_file::InfoFile};
+use self::{app_state::AppState, dev::DevCommands, info_file::InfoFile, watch::WatchExit};
 
 mod app_state;
 mod cargo_toml;
 mod cmd;
+mod collections;
 mod dev;
 mod embedded;
 mod exercise;
@@ -46,8 +47,6 @@ enum Subcommands {
         /// The name of the exercise
         name: Option<String>,
     },
-    /// Check all the exercises, marking them as done or pending accordingly.
-    CheckAll,
     /// Reset a single exercise
     Reset {
         /// The name of the exercise
@@ -58,31 +57,27 @@ enum Subcommands {
         /// The name of the exercise
         name: Option<String>,
     },
-    /// Commands for developing (community) Rustlings exercises
+    /// Commands for developing (third-party) Rustlings exercises
     #[command(subcommand)]
     Dev(DevCommands),
 }
 
-fn main() -> Result<ExitCode> {
+fn main() -> Result<()> {
     let args = Args::parse();
 
     if cfg!(not(debug_assertions)) && Path::new("dev/rustlings-repo.txt").exists() {
         bail!("{OLD_METHOD_ERR}");
     }
 
-    'priority_cmd: {
-        match args.command {
-            Some(Subcommands::Init) => init::init().context("Initialization failed")?,
-            Some(Subcommands::Dev(dev_command)) => dev_command.run()?,
-            _ => break 'priority_cmd,
-        }
-
-        return Ok(ExitCode::SUCCESS);
+    match args.command {
+        Some(Subcommands::Init) => return init::init().context("Initialization failed"),
+        Some(Subcommands::Dev(dev_command)) => return dev_command.run(),
+        _ => (),
     }
 
     if !Path::new("exercises").is_dir() {
         println!("{PRE_INIT_MSG}");
-        return Ok(ExitCode::FAILURE);
+        exit(1);
     }
 
     let info_file = InfoFile::parse()?;
@@ -104,11 +99,7 @@ fn main() -> Result<ExitCode> {
                 clear_terminal(&mut stdout)?;
 
                 let welcome_message = welcome_message.trim_ascii();
-                write!(
-                    stdout,
-                    "{welcome_message}\n\n\
-                     Press ENTER to continue "
-                )?;
+                write!(stdout, "{welcome_message}\n\nPress ENTER to continue ")?;
                 press_enter_prompt(&mut stdout)?;
                 clear_terminal(&mut stdout)?;
                 // Flush to be able to show errors occurring before printing a newline to stdout.
@@ -139,41 +130,21 @@ fn main() -> Result<ExitCode> {
                 )
             };
 
-            watch::watch(&mut app_state, notify_exercise_names)?;
+            loop {
+                match watch::watch(&mut app_state, notify_exercise_names)? {
+                    WatchExit::Shutdown => break,
+                    // It is much easier to exit the watch mode, launch the list mode and then restart
+                    // the watch mode instead of trying to pause the watch threads and correct the
+                    // watch state.
+                    WatchExit::List => list::list(&mut app_state)?,
+                }
+            }
         }
         Some(Subcommands::Run { name }) => {
             if let Some(name) = name {
                 app_state.set_current_exercise_by_name(&name)?;
             }
-            return run::run(&mut app_state);
-        }
-        Some(Subcommands::CheckAll) => {
-            let mut stdout = io::stdout().lock();
-            if let Some(first_pending_exercise_ind) = app_state.check_all_exercises(&mut stdout)? {
-                if app_state.current_exercise().done {
-                    app_state.set_current_exercise_ind(first_pending_exercise_ind)?;
-                }
-
-                stdout.write_all(b"\n\n")?;
-                let pending = app_state.n_pending();
-                if pending == 1 {
-                    stdout.write_all(b"One exercise pending: ")?;
-                } else {
-                    write!(
-                        stdout,
-                        "{pending}/{} exercises pending. The first: ",
-                        app_state.exercises().len(),
-                    )?;
-                }
-                app_state
-                    .current_exercise()
-                    .terminal_file_link(&mut stdout, app_state.emit_file_links())?;
-                stdout.write_all(b"\n")?;
-
-                return Ok(ExitCode::FAILURE);
-            } else {
-                app_state.render_final_message(&mut stdout)?;
-            }
+            run::run(&mut app_state)?;
         }
         Some(Subcommands::Reset { name }) => {
             app_state.set_current_exercise_by_name(&name)?;
@@ -190,7 +161,7 @@ fn main() -> Result<ExitCode> {
         Some(Subcommands::Init | Subcommands::Dev(_)) => (),
     }
 
-    Ok(ExitCode::SUCCESS)
+    Ok(())
 }
 
 const OLD_METHOD_ERR: &str =

src/run.rs

@@ -1,19 +1,20 @@
 use anyhow::Result;
 use crossterm::{
-    QueueableCommand,
     style::{Color, ResetColor, SetForegroundColor},
+    QueueableCommand,
 };
 use std::{
     io::{self, Write},
-    process::ExitCode,
+    process::exit,
 };
 
 use crate::{
     app_state::{AppState, ExercisesProgress},
-    exercise::{OUTPUT_CAPACITY, RunnableExercise, solution_link_line},
+    exercise::{solution_link_line, RunnableExercise, OUTPUT_CAPACITY},
+    term::terminal_file_link,
 };
 
-pub fn run(app_state: &mut AppState) -> Result<ExitCode> {
+pub fn run(app_state: &mut AppState) -> Result<()> {
     let exercise = app_state.current_exercise();
     let mut output = Vec::with_capacity(OUTPUT_CAPACITY);
     let success = exercise.run_exercise(Some(&mut output), app_state.cmd_runner())?;
@@ -25,12 +26,9 @@ pub fn run(app_state: &mut AppState) -> Result<ExitCode> {
         app_state.set_pending(app_state.current_exercise_ind())?;
 
         stdout.write_all(b"Ran ")?;
-        app_state
-            .current_exercise()
-            .terminal_file_link(&mut stdout, app_state.emit_file_links())?;
+        terminal_file_link(&mut stdout, app_state.current_exercise().path, Color::Blue)?;
         stdout.write_all(b" with errors\n")?;
-
-        return Ok(ExitCode::FAILURE);
+        exit(1);
     }
 
     stdout.queue(SetForegroundColor(Color::Green))?;
@@ -41,20 +39,18 @@ pub fn run(app_state: &mut AppState) -> Result<ExitCode> {
 
     if let Some(solution_path) = app_state.current_solution_path()? {
         stdout.write_all(b"\n")?;
-        solution_link_line(&mut stdout, &solution_path, app_state.emit_file_links())?;
+        solution_link_line(&mut stdout, &solution_path)?;
         stdout.write_all(b"\n")?;
     }
 
-    match app_state.done_current_exercise::<false>(&mut stdout)? {
-        ExercisesProgress::NewPending | ExercisesProgress::CurrentPending => {
+    match app_state.done_current_exercise(&mut stdout)? {
+        ExercisesProgress::CurrentPending | ExercisesProgress::NewPending => {
             stdout.write_all(b"Next exercise: ")?;
-            app_state
-                .current_exercise()
-                .terminal_file_link(&mut stdout, app_state.emit_file_links())?;
+            terminal_file_link(&mut stdout, app_state.current_exercise().path, Color::Blue)?;
             stdout.write_all(b"\n")?;
         }
         ExercisesProgress::AllDone => (),
     }
 
-    Ok(ExitCode::SUCCESS)
+    Ok(())
 }

src/term.rs

@@ -1,25 +1,24 @@
-use crossterm::{
-    Command, QueueableCommand,
-    cursor::MoveTo,
-    style::{Attribute, Color, ResetColor, SetAttribute, SetForegroundColor},
-    terminal::{Clear, ClearType},
-};
 use std::{
     fmt, fs,
     io::{self, BufRead, StdoutLock, Write},
 };
 
-use crate::app_state::CheckProgress;
+use crossterm::{
+    cursor::MoveTo,
+    style::{Attribute, Color, ResetColor, SetAttribute, SetForegroundColor},
+    terminal::{Clear, ClearType},
+    Command, QueueableCommand,
+};
 
-pub struct MaxLenWriter<'a, 'lock> {
-    pub stdout: &'a mut StdoutLock<'lock>,
+pub struct MaxLenWriter<'a, 'b> {
+    pub stdout: &'a mut StdoutLock<'b>,
     len: usize,
     max_len: usize,
 }
 
-impl<'a, 'lock> MaxLenWriter<'a, 'lock> {
+impl<'a, 'b> MaxLenWriter<'a, 'b> {
     #[inline]
-    pub fn new(stdout: &'a mut StdoutLock<'lock>, max_len: usize) -> Self {
+    pub fn new(stdout: &'a mut StdoutLock<'b>, max_len: usize) -> Self {
         Self {
             stdout,
             len: 0,
@@ -34,13 +33,13 @@ impl<'a, 'lock> MaxLenWriter<'a, 'lock> {
     }
 }
 
-pub trait CountedWrite<'lock> {
+pub trait CountedWrite<'a> {
     fn write_ascii(&mut self, ascii: &[u8]) -> io::Result<()>;
     fn write_str(&mut self, unicode: &str) -> io::Result<()>;
-    fn stdout(&mut self) -> &mut StdoutLock<'lock>;
+    fn stdout(&mut self) -> &mut StdoutLock<'a>;
 }
 
-impl<'lock> CountedWrite<'lock> for MaxLenWriter<'_, 'lock> {
+impl<'a, 'b> CountedWrite<'b> for MaxLenWriter<'a, 'b> {
     fn write_ascii(&mut self, ascii: &[u8]) -> io::Result<()> {
         let n = ascii.len().min(self.max_len.saturating_sub(self.len));
         if n > 0 {
@@ -65,7 +64,7 @@ impl<'lock> CountedWrite<'lock> for MaxLenWriter<'_, 'lock> {
     }
 
     #[inline]
-    fn stdout(&mut self) -> &mut StdoutLock<'lock> {
+    fn stdout(&mut self) -> &mut StdoutLock<'b> {
         self.stdout
     }
 }
@@ -87,135 +86,33 @@ impl<'a> CountedWrite<'a> for StdoutLock<'a> {
     }
 }
 
-pub struct CheckProgressVisualizer<'a, 'lock> {
-    stdout: &'a mut StdoutLock<'lock>,
-    n_cols: usize,
-}
-
-impl<'a, 'lock> CheckProgressVisualizer<'a, 'lock> {
-    const CHECKING_COLOR: Color = Color::Blue;
-    const DONE_COLOR: Color = Color::Green;
-    const PENDING_COLOR: Color = Color::Red;
-
-    pub fn build(stdout: &'a mut StdoutLock<'lock>, term_width: u16) -> io::Result<Self> {
-        clear_terminal(stdout)?;
-        stdout.write_all("Checking all exercises…\n".as_bytes())?;
-
-        // Legend
-        stdout.write_all(b"Color of exercise number: ")?;
-        stdout.queue(SetForegroundColor(Self::CHECKING_COLOR))?;
-        stdout.write_all(b"Checking")?;
-        stdout.queue(ResetColor)?;
-        stdout.write_all(b" - ")?;
-        stdout.queue(SetForegroundColor(Self::DONE_COLOR))?;
-        stdout.write_all(b"Done")?;
-        stdout.queue(ResetColor)?;
-        stdout.write_all(b" - ")?;
-        stdout.queue(SetForegroundColor(Self::PENDING_COLOR))?;
-        stdout.write_all(b"Pending")?;
-        stdout.queue(ResetColor)?;
-        stdout.write_all(b"\n")?;
-
-        // Exercise numbers with up to 3 digits.
-        // +1 because the last column doesn't end with a whitespace.
-        let n_cols = usize::from(term_width + 1) / 4;
-
-        Ok(Self { stdout, n_cols })
-    }
-
-    pub fn update(&mut self, progresses: &[CheckProgress]) -> io::Result<()> {
-        self.stdout.queue(MoveTo(0, 2))?;
-
-        let mut exercise_num = 1;
-        for exercise_progress in progresses {
-            match exercise_progress {
-                CheckProgress::None => (),
-                CheckProgress::Checking => {
-                    self.stdout
-                        .queue(SetForegroundColor(Self::CHECKING_COLOR))?;
-                }
-                CheckProgress::Done => {
-                    self.stdout.queue(SetForegroundColor(Self::DONE_COLOR))?;
-                }
-                CheckProgress::Pending => {
-                    self.stdout.queue(SetForegroundColor(Self::PENDING_COLOR))?;
-                }
-            }
-
-            write!(self.stdout, "{exercise_num:<3}")?;
-            self.stdout.queue(ResetColor)?;
-
-            if exercise_num != progresses.len() {
-                if exercise_num % self.n_cols == 0 {
-                    self.stdout.write_all(b"\n")?;
-                } else {
-                    self.stdout.write_all(b" ")?;
-                }
-
-                exercise_num += 1;
-            }
-        }
-
-        self.stdout.flush()
-    }
-}
-
-pub struct ProgressCounter<'a, 'lock> {
-    stdout: &'a mut StdoutLock<'lock>,
-    total: usize,
-    counter: usize,
-}
-
-impl<'a, 'lock> ProgressCounter<'a, 'lock> {
-    pub fn new(stdout: &'a mut StdoutLock<'lock>, total: usize) -> io::Result<Self> {
-        write!(stdout, "Progress: 0/{total}")?;
-        stdout.flush()?;
-
-        Ok(Self {
-            stdout,
-            total,
-            counter: 0,
-        })
-    }
-
-    pub fn increment(&mut self) -> io::Result<()> {
-        self.counter += 1;
-        write!(self.stdout, "\rProgress: {}/{}", self.counter, self.total)?;
-        self.stdout.flush()
-    }
-}
-
-impl Drop for ProgressCounter<'_, '_> {
-    fn drop(&mut self) {
-        let _ = self.stdout.write_all(b"\n\n");
-    }
-}
-
+/// Terminal progress bar to be used when not using Ratataui.
 pub fn progress_bar<'a>(
     writer: &mut impl CountedWrite<'a>,
     progress: u16,
     total: u16,
-    term_width: u16,
+    line_width: u16,
 ) -> io::Result<()> {
-    debug_assert!(total <= 999);
     debug_assert!(progress <= total);
 
     const PREFIX: &[u8] = b"Progress: [";
     const PREFIX_WIDTH: u16 = PREFIX.len() as u16;
-    const POSTFIX_WIDTH: u16 = "] xxx/xxx".len() as u16;
+    // Leaving the last char empty (_) for `total` > 99.
+    const POSTFIX_WIDTH: u16 = "] xxx/xx exercises_".len() as u16;
     const WRAPPER_WIDTH: u16 = PREFIX_WIDTH + POSTFIX_WIDTH;
     const MIN_LINE_WIDTH: u16 = WRAPPER_WIDTH + 4;
 
-    if term_width < MIN_LINE_WIDTH {
+    if line_width < MIN_LINE_WIDTH {
         writer.write_ascii(b"Progress: ")?;
         // Integers are in ASCII.
-        return writer.write_ascii(format!("{progress}/{total}").as_bytes());
+        writer.write_ascii(format!("{progress}/{total}").as_bytes())?;
+        return writer.write_ascii(b" exercises");
     }
 
     let stdout = writer.stdout();
     stdout.write_all(PREFIX)?;
 
-    let width = term_width - WRAPPER_WIDTH;
+    let width = line_width - WRAPPER_WIDTH;
     let filled = (width * progress) / total;
 
     stdout.queue(SetForegroundColor(Color::Green))?;
@@ -236,9 +133,8 @@ pub fn progress_bar<'a>(
         }
     }
 
-    stdout.queue(SetForegroundColor(Color::Reset))?;
-
-    write!(stdout, "] {progress:>3}/{total}")
+    stdout.queue(ResetColor)?;
+    write!(stdout, "] {progress:>3}/{total} exercises")
 }
 
 pub fn clear_terminal(stdout: &mut StdoutLock) -> io::Result<()> {
@@ -255,35 +151,35 @@ pub fn press_enter_prompt(stdout: &mut StdoutLock) -> io::Result<()> {
     stdout.write_all(b"\n")
 }
 
-/// Canonicalize, convert to string and remove verbatim part on Windows.
-pub fn canonicalize(path: &str) -> Option<String> {
-    fs::canonicalize(path)
-        .ok()?
-        .into_os_string()
-        .into_string()
-        .ok()
-        .map(|mut path| {
-            // Windows itself can't handle its verbatim paths.
-            if cfg!(windows) && path.as_bytes().starts_with(br"\\?\") {
-                path.drain(..4);
-            }
-
-            path
-        })
-}
-
-pub fn file_path<'a, W: CountedWrite<'a>>(
-    writer: &mut W,
+pub fn terminal_file_link<'a>(
+    writer: &mut impl CountedWrite<'a>,
+    path: &str,
     color: Color,
-    f: impl FnOnce(&mut W) -> io::Result<()>,
 ) -> io::Result<()> {
+    let canonical_path = fs::canonicalize(path).ok();
+
+    let Some(canonical_path) = canonical_path.as_deref().and_then(|p| p.to_str()) else {
+        return writer.write_str(path);
+    };
+
+    // Windows itself can't handle its verbatim paths.
+    #[cfg(windows)]
+    let canonical_path = if canonical_path.len() > 5 && &canonical_path[0..4] == r"\\?\" {
+        &canonical_path[4..]
+    } else {
+        canonical_path
+    };
+
     writer
         .stdout()
         .queue(SetForegroundColor(color))?
         .queue(SetAttribute(Attribute::Underlined))?;
-
-    f(writer)?;
-
+    writer.stdout().write_all(b"\x1b]8;;file://")?;
+    writer.stdout().write_all(canonical_path.as_bytes())?;
+    writer.stdout().write_all(b"\x1b\\")?;
+    // Only this part is visible.
+    writer.write_str(path)?;
+    writer.stdout().write_all(b"\x1b]8;;\x1b\\")?;
     writer
         .stdout()
         .queue(SetForegroundColor(Color::Reset))?
@@ -292,19 +188,6 @@ pub fn file_path<'a, W: CountedWrite<'a>>(
     Ok(())
 }
 
-pub fn terminal_file_link<'a>(
-    writer: &mut impl CountedWrite<'a>,
-    path: &str,
-    canonical_path: &str,
-) -> io::Result<()> {
-    writer.stdout().write_all(b"\x1b]8;;file://")?;
-    writer.stdout().write_all(canonical_path.as_bytes())?;
-    writer.stdout().write_all(b"\x1b\\")?;
-    // Only this part is visible.
-    writer.write_str(path)?;
-    writer.stdout().write_all(b"\x1b]8;;\x1b\\")
-}
-
 pub fn write_ansi(output: &mut Vec<u8>, command: impl Command) {
     struct FmtWriter<'a>(&'a mut Vec<u8>);
 

src/watch.rs

@@ -1,129 +1,106 @@
 use anyhow::{Error, Result};
-use notify::{Config, RecommendedWatcher, RecursiveMode, Watcher};
+use notify_debouncer_mini::{
+    new_debouncer,
+    notify::{self, RecursiveMode},
+};
 use std::{
     io::{self, Write},
     path::Path,
-    sync::{
-        atomic::{AtomicBool, Ordering::Relaxed},
-        mpsc::channel,
-    },
+    sync::mpsc::channel,
+    thread,
     time::Duration,
 };
 
-use crate::{
-    app_state::{AppState, ExercisesProgress},
-    list,
-};
+use crate::app_state::{AppState, ExercisesProgress};
 
-use self::{notify_event::NotifyEventHandler, state::WatchState, terminal_event::InputEvent};
+use self::{
+    notify_event::NotifyEventHandler,
+    state::WatchState,
+    terminal_event::{terminal_event_handler, InputEvent},
+};
 
 mod notify_event;
 mod state;
 mod terminal_event;
 
-static EXERCISE_RUNNING: AtomicBool = AtomicBool::new(false);
-
-// Private unit type to force using the constructor function.
-#[must_use = "When the guard is dropped, the input is unpaused"]
-pub struct InputPauseGuard(());
-
-impl InputPauseGuard {
-    #[inline]
-    pub fn scoped_pause() -> Self {
-        EXERCISE_RUNNING.store(true, Relaxed);
-        Self(())
-    }
-}
-
-impl Drop for InputPauseGuard {
-    #[inline]
-    fn drop(&mut self) {
-        EXERCISE_RUNNING.store(false, Relaxed);
-    }
-}
-
 enum WatchEvent {
     Input(InputEvent),
     FileChange { exercise_ind: usize },
-    TerminalResize { width: u16 },
+    TerminalResize,
     NotifyErr(notify::Error),
     TerminalEventErr(io::Error),
 }
 
 /// Returned by the watch mode to indicate what to do afterwards.
 #[must_use]
-enum WatchExit {
+pub enum WatchExit {
     /// Exit the program.
     Shutdown,
     /// Enter the list mode and restart the watch mode afterwards.
     List,
 }
 
-fn run_watch(
+/// `notify_exercise_names` as None activates the manual run mode.
+pub fn watch(
     app_state: &mut AppState,
     notify_exercise_names: Option<&'static [&'static [u8]]>,
 ) -> Result<WatchExit> {
-    let (watch_event_sender, watch_event_receiver) = channel();
+    let (tx, rx) = channel();
 
     let mut manual_run = false;
     // Prevent dropping the guard until the end of the function.
     // Otherwise, the file watcher exits.
-    let _watcher_guard = if let Some(exercise_names) = notify_exercise_names {
-        let notify_event_handler =
-            NotifyEventHandler::build(watch_event_sender.clone(), exercise_names)?;
-
-        let mut watcher = RecommendedWatcher::new(
-            notify_event_handler,
-            Config::default()
-                .with_follow_symlinks(false)
-                .with_poll_interval(Duration::from_secs(1)),
+    let _debouncer_guard = if let Some(exercise_names) = notify_exercise_names {
+        let mut debouncer = new_debouncer(
+            Duration::from_millis(200),
+            NotifyEventHandler {
+                tx: tx.clone(),
+                exercise_names,
+            },
         )
         .inspect_err(|_| eprintln!("{NOTIFY_ERR}"))?;
-
-        watcher
+        debouncer
+            .watcher()
             .watch(Path::new("exercises"), RecursiveMode::Recursive)
             .inspect_err(|_| eprintln!("{NOTIFY_ERR}"))?;
 
-        Some(watcher)
+        Some(debouncer)
     } else {
         manual_run = true;
         None
     };
 
-    let mut watch_state = WatchState::build(app_state, watch_event_sender, manual_run)?;
-    let mut stdout = io::stdout().lock();
+    let mut watch_state = WatchState::new(app_state, manual_run);
 
+    let mut stdout = io::stdout().lock();
     watch_state.run_current_exercise(&mut stdout)?;
 
-    while let Ok(event) = watch_event_receiver.recv() {
+    thread::spawn(move || terminal_event_handler(tx, manual_run));
+
+    while let Ok(event) = rx.recv() {
         match event {
             WatchEvent::Input(InputEvent::Next) => match watch_state.next_exercise(&mut stdout)? {
                 ExercisesProgress::AllDone => break,
-                ExercisesProgress::NewPending => watch_state.run_current_exercise(&mut stdout)?,
-                ExercisesProgress::CurrentPending => (),
-            },
-            WatchEvent::Input(InputEvent::Run) => watch_state.run_current_exercise(&mut stdout)?,
-            WatchEvent::Input(InputEvent::Hint) => watch_state.show_hint(&mut stdout)?,
-            WatchEvent::Input(InputEvent::List) => return Ok(WatchExit::List),
-            WatchEvent::Input(InputEvent::CheckAll) => match watch_state
-                .check_all_exercises(&mut stdout)?
-            {
-                ExercisesProgress::AllDone => break,
-                ExercisesProgress::NewPending => watch_state.run_current_exercise(&mut stdout)?,
                 ExercisesProgress::CurrentPending => watch_state.render(&mut stdout)?,
+                ExercisesProgress::NewPending => watch_state.run_current_exercise(&mut stdout)?,
             },
-            WatchEvent::Input(InputEvent::Reset) => watch_state.reset_exercise(&mut stdout)?,
+            WatchEvent::Input(InputEvent::Hint) => watch_state.show_hint(&mut stdout)?,
+            WatchEvent::Input(InputEvent::List) => {
+                return Ok(WatchExit::List);
+            }
             WatchEvent::Input(InputEvent::Quit) => {
                 stdout.write_all(QUIT_MSG)?;
                 break;
             }
+            WatchEvent::Input(InputEvent::Run) => watch_state.run_current_exercise(&mut stdout)?,
+            WatchEvent::Input(InputEvent::Unrecognized) => watch_state.render(&mut stdout)?,
             WatchEvent::FileChange { exercise_ind } => {
                 watch_state.handle_file_change(exercise_ind, &mut stdout)?;
             }
-            WatchEvent::TerminalResize { width } => {
-                watch_state.update_term_width(width, &mut stdout)?;
+            WatchEvent::TerminalResize => watch_state.render(&mut stdout)?,
+            WatchEvent::NotifyErr(e) => {
+                return Err(Error::from(e).context(NOTIFY_ERR));
             }
-            WatchEvent::NotifyErr(e) => return Err(Error::from(e).context(NOTIFY_ERR)),
             WatchEvent::TerminalEventErr(e) => {
                 return Err(Error::from(e).context("Terminal event listener failed"));
             }
@@ -133,52 +110,9 @@ fn run_watch(
     Ok(WatchExit::Shutdown)
 }
 
-fn watch_list_loop(
-    app_state: &mut AppState,
-    notify_exercise_names: Option<&'static [&'static [u8]]>,
-) -> Result<()> {
-    loop {
-        match run_watch(app_state, notify_exercise_names)? {
-            WatchExit::Shutdown => break Ok(()),
-            // It is much easier to exit the watch mode, launch the list mode and then restart
-            // the watch mode instead of trying to pause the watch threads and correct the
-            // watch state.
-            WatchExit::List => list::list(app_state)?,
-        }
-    }
-}
-
-/// `notify_exercise_names` as None activates the manual run mode.
-pub fn watch(
-    app_state: &mut AppState,
-    notify_exercise_names: Option<&'static [&'static [u8]]>,
-) -> Result<()> {
-    #[cfg(not(windows))]
-    {
-        let stdin_fd = rustix::stdio::stdin();
-        let mut termios = rustix::termios::tcgetattr(stdin_fd)?;
-        let original_local_modes = termios.local_modes;
-        // Disable stdin line buffering and hide input.
-        termios.local_modes -=
-            rustix::termios::LocalModes::ICANON | rustix::termios::LocalModes::ECHO;
-        rustix::termios::tcsetattr(stdin_fd, rustix::termios::OptionalActions::Now, &termios)?;
-
-        let res = watch_list_loop(app_state, notify_exercise_names);
-
-        termios.local_modes = original_local_modes;
-        rustix::termios::tcsetattr(stdin_fd, rustix::termios::OptionalActions::Now, &termios)?;
-
-        res
-    }
-
-    #[cfg(windows)]
-    watch_list_loop(app_state, notify_exercise_names)
-}
-
 const QUIT_MSG: &[u8] = b"
-
 We hope you're enjoying learning Rust!
-If you want to continue working on the exercises at a later point, you can simply run `rustlings` again in this directory.
+If you want to continue working on the exercises at a later point, you can simply run `rustlings` again.
 ";
 
 const NOTIFY_ERR: &str = "

src/watch/notify_event.rs

@@ -1,132 +1,52 @@
-use anyhow::{Context, Result};
-use notify::{
-    Event, EventKind,
-    event::{AccessKind, AccessMode, MetadataKind, ModifyKind, RenameMode},
-};
-use std::{
-    sync::{
-        atomic::Ordering::Relaxed,
-        mpsc::{RecvTimeoutError, Sender, SyncSender, sync_channel},
-    },
-    thread,
-    time::Duration,
-};
+use notify_debouncer_mini::{DebounceEventResult, DebouncedEventKind};
+use std::sync::mpsc::Sender;
 
-use super::{EXERCISE_RUNNING, WatchEvent};
-
-const DEBOUNCE_DURATION: Duration = Duration::from_millis(200);
+use super::WatchEvent;
 
 pub struct NotifyEventHandler {
-    error_sender: Sender<WatchEvent>,
-    // Sends the index of the updated exercise.
-    update_sender: SyncSender<usize>,
-    // Used to report which exercise was modified.
-    exercise_names: &'static [&'static [u8]],
+    pub tx: Sender<WatchEvent>,
+    /// Used to report which exercise was modified.
+    pub exercise_names: &'static [&'static [u8]],
 }
 
-impl NotifyEventHandler {
-    pub fn build(
-        watch_event_sender: Sender<WatchEvent>,
-        exercise_names: &'static [&'static [u8]],
-    ) -> Result<Self> {
-        let (update_sender, update_receiver) = sync_channel(0);
-        let error_sender = watch_event_sender.clone();
-
-        // Debouncer
-        thread::Builder::new()
-            .spawn(move || {
-                let mut exercise_updated = vec![false; exercise_names.len()];
-
-                loop {
-                    match update_receiver.recv_timeout(DEBOUNCE_DURATION) {
-                        Ok(exercise_ind) => exercise_updated[exercise_ind] = true,
-                        Err(RecvTimeoutError::Timeout) => {
-                            for (exercise_ind, updated) in exercise_updated.iter_mut().enumerate() {
-                                if *updated {
-                                    if watch_event_sender
-                                        .send(WatchEvent::FileChange { exercise_ind })
-                                        .is_err()
-                                    {
-                                        break;
-                                    }
-
-                                    *updated = false;
-                                }
-                            }
+impl notify_debouncer_mini::DebounceEventHandler for NotifyEventHandler {
+    fn handle_event(&mut self, input_event: DebounceEventResult) {
+        let output_event = match input_event {
+            Ok(input_event) => {
+                let Some(exercise_ind) = input_event
+                    .iter()
+                    .filter_map(|input_event| {
+                        if input_event.kind != DebouncedEventKind::Any {
+                            return None;
                         }
-                        Err(RecvTimeoutError::Disconnected) => break,
-                    }
-                }
-            })
-            .context("Failed to spawn a thread to debounce file changes")?;
 
-        Ok(Self {
-            error_sender,
-            update_sender,
-            exercise_names,
-        })
-    }
-}
+                        let file_name = input_event.path.file_name()?.to_str()?.as_bytes();
 
-impl notify::EventHandler for NotifyEventHandler {
-    fn handle_event(&mut self, input_event: notify::Result<Event>) {
-        if EXERCISE_RUNNING.load(Relaxed) {
-            return;
-        }
+                        if file_name.len() < 4 {
+                            return None;
+                        }
+                        let (file_name_without_ext, ext) = file_name.split_at(file_name.len() - 3);
 
-        let input_event = match input_event {
-            Ok(v) => v,
-            Err(e) => {
-                // An error occurs when the receiver is dropped.
-                // After dropping the receiver, the watcher guard should also be dropped.
-                let _ = self.error_sender.send(WatchEvent::NotifyErr(e));
-                return;
-            }
-        };
+                        if ext != b".rs" {
+                            return None;
+                        }
 
-        match input_event.kind {
-            EventKind::Any => (),
-            EventKind::Modify(modify_kind) => match modify_kind {
-                ModifyKind::Any | ModifyKind::Data(_) => (),
-                ModifyKind::Name(rename_mode) => match rename_mode {
-                    RenameMode::Any | RenameMode::To => (),
-                    RenameMode::From | RenameMode::Both | RenameMode::Other => return,
-                },
-                ModifyKind::Metadata(metadata_kind) => match metadata_kind {
-                    MetadataKind::Any | MetadataKind::WriteTime => (),
-                    MetadataKind::AccessTime
-                    | MetadataKind::Permissions
-                    | MetadataKind::Ownership
-                    | MetadataKind::Extended
-                    | MetadataKind::Other => return,
-                },
-                ModifyKind::Other => return,
-            },
-            EventKind::Access(access_kind) => match access_kind {
-                AccessKind::Any => (),
-                AccessKind::Close(access_mode) => match access_mode {
-                    AccessMode::Any | AccessMode::Write => (),
-                    AccessMode::Execute | AccessMode::Read | AccessMode::Other => return,
-                },
-                AccessKind::Read | AccessKind::Open(_) | AccessKind::Other => return,
-            },
-            EventKind::Create(_) | EventKind::Remove(_) | EventKind::Other => return,
-        }
-
-        let _ = input_event
-            .paths
-            .into_iter()
-            .filter_map(|path| {
-                let file_name = path.file_name()?.to_str()?.as_bytes();
-
-                let [file_name_without_ext @ .., b'.', b'r', b's'] = file_name else {
-                    return None;
+                        self.exercise_names
+                            .iter()
+                            .position(|exercise_name| *exercise_name == file_name_without_ext)
+                    })
+                    .min()
+                else {
+                    return;
                 };
 
-                self.exercise_names
-                    .iter()
-                    .position(|exercise_name| *exercise_name == file_name_without_ext)
-            })
-            .try_for_each(|exercise_ind| self.update_sender.send(exercise_ind));
+                WatchEvent::FileChange { exercise_ind }
+            }
+            Err(e) => WatchEvent::NotifyErr(e),
+        };
+
+        // An error occurs when the receiver is dropped.
+        // After dropping the receiver, the debouncer guard should also be dropped.
+        let _ = self.tx.send(output_event);
     }
 }

src/watch/state.rs

@@ -1,30 +1,19 @@
-use anyhow::{Context, Result};
+use anyhow::Result;
 use crossterm::{
-    QueueableCommand,
     style::{
         Attribute, Attributes, Color, ResetColor, SetAttribute, SetAttributes, SetForegroundColor,
     },
-    terminal,
-};
-use std::{
-    io::{self, Read, StdoutLock, Write},
-    sync::mpsc::{Sender, SyncSender, sync_channel},
-    thread,
+    terminal, QueueableCommand,
 };
+use std::io::{self, StdoutLock, Write};
 
 use crate::{
     app_state::{AppState, ExercisesProgress},
     clear_terminal,
-    exercise::{OUTPUT_CAPACITY, RunnableExercise, solution_link_line},
-    term::progress_bar,
+    exercise::{solution_link_line, RunnableExercise, OUTPUT_CAPACITY},
+    term::{progress_bar, terminal_file_link},
 };
 
-use super::{InputPauseGuard, WatchEvent, terminal_event::terminal_event_handler};
-
-const HEADING_ATTRIBUTES: Attributes = Attributes::none()
-    .with(Attribute::Bold)
-    .with(Attribute::Underlined);
-
 #[derive(PartialEq, Eq)]
 enum DoneStatus {
     DoneWithSolution(String),
@@ -38,47 +27,20 @@ pub struct WatchState<'a> {
     show_hint: bool,
     done_status: DoneStatus,
     manual_run: bool,
-    term_width: u16,
-    terminal_event_unpause_sender: SyncSender<()>,
 }
 
 impl<'a> WatchState<'a> {
-    pub fn build(
-        app_state: &'a mut AppState,
-        watch_event_sender: Sender<WatchEvent>,
-        manual_run: bool,
-    ) -> Result<Self> {
-        let term_width = terminal::size()
-            .context("Failed to get the terminal size")?
-            .0;
-
-        let (terminal_event_unpause_sender, terminal_event_unpause_receiver) = sync_channel(0);
-
-        thread::Builder::new()
-            .spawn(move || {
-                terminal_event_handler(
-                    watch_event_sender,
-                    terminal_event_unpause_receiver,
-                    manual_run,
-                )
-            })
-            .context("Failed to spawn a thread to handle terminal events")?;
-
-        Ok(Self {
+    pub fn new(app_state: &'a mut AppState, manual_run: bool) -> Self {
+        Self {
             app_state,
             output: Vec::with_capacity(OUTPUT_CAPACITY),
             show_hint: false,
             done_status: DoneStatus::Pending,
             manual_run,
-            term_width,
-            terminal_event_unpause_sender,
-        })
+        }
     }
 
     pub fn run_current_exercise(&mut self, stdout: &mut StdoutLock) -> Result<()> {
-        // Ignore any input until running the exercise is done.
-        let _input_pause_guard = InputPauseGuard::scoped_pause();
-
         self.show_hint = false;
 
         writeln!(
@@ -110,67 +72,39 @@ impl<'a> WatchState<'a> {
         Ok(())
     }
 
-    pub fn reset_exercise(&mut self, stdout: &mut StdoutLock) -> Result<()> {
-        clear_terminal(stdout)?;
-
-        stdout.write_all(b"Resetting will undo all your changes to the file ")?;
-        stdout.write_all(self.app_state.current_exercise().path.as_bytes())?;
-        stdout.write_all(b"\nReset (y/n)? ")?;
-        stdout.flush()?;
-
-        {
-            let mut stdin = io::stdin().lock();
-            let mut answer = [0];
-            loop {
-                stdin
-                    .read_exact(&mut answer)
-                    .context("Failed to read the user's input")?;
-
-                match answer[0] {
-                    b'y' | b'Y' => {
-                        self.app_state.reset_current_exercise()?;
-
-                        // The file watcher reruns the exercise otherwise.
-                        if self.manual_run {
-                            self.run_current_exercise(stdout)?;
-                        }
-                    }
-                    b'n' | b'N' => self.render(stdout)?,
-                    _ => continue,
-                }
-
-                break;
-            }
-        }
-
-        self.terminal_event_unpause_sender.send(())?;
-
-        Ok(())
-    }
-
     pub fn handle_file_change(
         &mut self,
         exercise_ind: usize,
         stdout: &mut StdoutLock,
     ) -> Result<()> {
-        if self.app_state.current_exercise_ind() != exercise_ind {
+        // Don't skip exercises on file changes to avoid confusion from missing exercises.
+        // Skipping exercises must be explicit in the interactive list.
+        // But going back to an earlier exercise on file change is fine.
+        if self.app_state.current_exercise_ind() < exercise_ind {
             return Ok(());
         }
 
+        self.app_state.set_current_exercise_ind(exercise_ind)?;
         self.run_current_exercise(stdout)
     }
 
     /// Move on to the next exercise if the current one is done.
     pub fn next_exercise(&mut self, stdout: &mut StdoutLock) -> Result<ExercisesProgress> {
-        match self.done_status {
-            DoneStatus::DoneWithSolution(_) | DoneStatus::DoneWithoutSolution => (),
-            DoneStatus::Pending => return Ok(ExercisesProgress::CurrentPending),
+        if self.done_status == DoneStatus::Pending {
+            return Ok(ExercisesProgress::CurrentPending);
         }
 
-        self.app_state.done_current_exercise::<true>(stdout)
+        self.app_state.done_current_exercise(stdout)
     }
 
     fn show_prompt(&self, stdout: &mut StdoutLock) -> io::Result<()> {
+        if self.manual_run {
+            stdout.queue(SetAttribute(Attribute::Bold))?;
+            stdout.write_all(b"r")?;
+            stdout.queue(ResetColor)?;
+            stdout.write_all(b":run / ")?;
+        }
+
         if self.done_status != DoneStatus::Pending {
             stdout.queue(SetAttribute(Attribute::Bold))?;
             stdout.write_all(b"n")?;
@@ -182,25 +116,22 @@ impl<'a> WatchState<'a> {
             stdout.write_all(b" / ")?;
         }
 
-        let mut show_key = |key, postfix| {
-            stdout.queue(SetAttribute(Attribute::Bold))?;
-            stdout.write_all(&[key])?;
-            stdout.queue(ResetColor)?;
-            stdout.write_all(postfix)
-        };
-
-        if self.manual_run {
-            show_key(b'r', b":run / ")?;
-        }
-
         if !self.show_hint {
-            show_key(b'h', b":hint / ")?;
+            stdout.queue(SetAttribute(Attribute::Bold))?;
+            stdout.write_all(b"h")?;
+            stdout.queue(ResetColor)?;
+            stdout.write_all(b":hint / ")?;
         }
 
-        show_key(b'l', b":list / ")?;
-        show_key(b'c', b":check all / ")?;
-        show_key(b'x', b":reset / ")?;
-        show_key(b'q', b":quit ? ")?;
+        stdout.queue(SetAttribute(Attribute::Bold))?;
+        stdout.write_all(b"l")?;
+        stdout.queue(ResetColor)?;
+        stdout.write_all(b":list / ")?;
+
+        stdout.queue(SetAttribute(Attribute::Bold))?;
+        stdout.write_all(b"q")?;
+        stdout.queue(ResetColor)?;
+        stdout.write_all(b":quit ? ")?;
 
         stdout.flush()
     }
@@ -214,7 +145,9 @@ impl<'a> WatchState<'a> {
 
         if self.show_hint {
             stdout
-                .queue(SetAttributes(HEADING_ATTRIBUTES))?
+                .queue(SetAttributes(
+                    Attributes::from(Attribute::Bold).with(Attribute::Underlined),
+                ))?
                 .queue(SetForegroundColor(Color::Cyan))?;
             stdout.write_all(b"Hint")?;
             stdout.queue(ResetColor)?;
@@ -233,7 +166,7 @@ impl<'a> WatchState<'a> {
             stdout.write_all(b"\n")?;
 
             if let DoneStatus::DoneWithSolution(solution_path) = &self.done_status {
-                solution_link_line(stdout, solution_path, self.app_state.emit_file_links())?;
+                solution_link_line(stdout, solution_path)?;
             }
 
             stdout.write_all(
@@ -242,17 +175,16 @@ impl<'a> WatchState<'a> {
             )?;
         }
 
+        let line_width = terminal::size()?.0;
         progress_bar(
             stdout,
             self.app_state.n_done(),
             self.app_state.exercises().len() as u16,
-            self.term_width,
+            line_width,
         )?;
 
         stdout.write_all(b"\nCurrent exercise: ")?;
-        self.app_state
-            .current_exercise()
-            .terminal_file_link(stdout, self.app_state.emit_file_links())?;
+        terminal_file_link(stdout, self.app_state.current_exercise().path, Color::Blue)?;
         stdout.write_all(b"\n\n")?;
 
         self.show_prompt(stdout)?;
@@ -261,39 +193,7 @@ impl<'a> WatchState<'a> {
     }
 
     pub fn show_hint(&mut self, stdout: &mut StdoutLock) -> io::Result<()> {
-        if !self.show_hint {
-            self.show_hint = true;
-            self.render(stdout)?;
-        }
-
-        Ok(())
-    }
-
-    pub fn check_all_exercises(&mut self, stdout: &mut StdoutLock) -> Result<ExercisesProgress> {
-        // Ignore any input until checking all exercises is done.
-        let _input_pause_guard = InputPauseGuard::scoped_pause();
-
-        if let Some(first_pending_exercise_ind) = self.app_state.check_all_exercises(stdout)? {
-            // Only change exercise if the current one is done.
-            if self.app_state.current_exercise().done {
-                self.app_state
-                    .set_current_exercise_ind(first_pending_exercise_ind)?;
-                Ok(ExercisesProgress::NewPending)
-            } else {
-                Ok(ExercisesProgress::CurrentPending)
-            }
-        } else {
-            self.app_state.render_final_message(stdout)?;
-            Ok(ExercisesProgress::AllDone)
-        }
-    }
-
-    pub fn update_term_width(&mut self, width: u16, stdout: &mut StdoutLock) -> io::Result<()> {
-        if self.term_width != width {
-            self.term_width = width;
-            self.render(stdout)?;
-        }
-
-        Ok(())
+        self.show_hint = true;
+        self.render(stdout)
     }
 }

src/watch/terminal_event.rs

@@ -1,73 +1,86 @@
-use crossterm::event::{self, Event, KeyCode, KeyEventKind};
-use std::sync::{
-    atomic::Ordering::Relaxed,
-    mpsc::{Receiver, Sender},
-};
+use crossterm::event::{self, Event, KeyCode, KeyEventKind, KeyModifiers};
+use std::sync::mpsc::Sender;
 
-use super::{EXERCISE_RUNNING, WatchEvent};
+use super::WatchEvent;
 
 pub enum InputEvent {
-    Next,
     Run,
+    Next,
     Hint,
     List,
-    CheckAll,
-    Reset,
     Quit,
+    Unrecognized,
 }
 
-pub fn terminal_event_handler(
-    sender: Sender<WatchEvent>,
-    unpause_receiver: Receiver<()>,
-    manual_run: bool,
-) {
-    let last_watch_event = loop {
-        match event::read() {
-            Ok(Event::Key(key)) => {
+pub fn terminal_event_handler(tx: Sender<WatchEvent>, manual_run: bool) {
+    // Only send `Unrecognized` on ENTER if the last input wasn't valid.
+    let mut last_input_valid = false;
+
+    let last_input_event = loop {
+        let terminal_event = match event::read() {
+            Ok(v) => v,
+            Err(e) => {
+                // If `send` returns an error, then the receiver is dropped and
+                // a shutdown has been already initialized.
+                let _ = tx.send(WatchEvent::TerminalEventErr(e));
+                return;
+            }
+        };
+
+        match terminal_event {
+            Event::Key(key) => {
                 match key.kind {
                     KeyEventKind::Release | KeyEventKind::Repeat => continue,
                     KeyEventKind::Press => (),
                 }
 
-                if EXERCISE_RUNNING.load(Relaxed) {
+                if key.modifiers != KeyModifiers::NONE {
+                    last_input_valid = false;
                     continue;
                 }
 
                 let input_event = match key.code {
-                    KeyCode::Char('n') => InputEvent::Next,
-                    KeyCode::Char('r') if manual_run => InputEvent::Run,
-                    KeyCode::Char('h') => InputEvent::Hint,
-                    KeyCode::Char('l') => break WatchEvent::Input(InputEvent::List),
-                    KeyCode::Char('c') => InputEvent::CheckAll,
-                    KeyCode::Char('x') => {
-                        if sender.send(WatchEvent::Input(InputEvent::Reset)).is_err() {
-                            return;
+                    KeyCode::Enter => {
+                        if last_input_valid {
+                            continue;
                         }
 
-                        // Pause input until quitting the confirmation prompt.
-                        if unpause_receiver.recv().is_err() {
-                            return;
+                        InputEvent::Unrecognized
+                    }
+                    KeyCode::Char(c) => {
+                        let input_event = match c {
+                            'n' => InputEvent::Next,
+                            'h' => InputEvent::Hint,
+                            'l' => break InputEvent::List,
+                            'q' => break InputEvent::Quit,
+                            'r' if manual_run => InputEvent::Run,
+                            _ => {
+                                last_input_valid = false;
+                                continue;
+                            }
                         };
 
+                        last_input_valid = true;
+                        input_event
+                    }
+                    _ => {
+                        last_input_valid = false;
                         continue;
                     }
-                    KeyCode::Char('q') => break WatchEvent::Input(InputEvent::Quit),
-                    _ => continue,
                 };
 
-                if sender.send(WatchEvent::Input(input_event)).is_err() {
+                if tx.send(WatchEvent::Input(input_event)).is_err() {
                     return;
                 }
             }
-            Ok(Event::Resize(width, _)) => {
-                if sender.send(WatchEvent::TerminalResize { width }).is_err() {
+            Event::Resize(_, _) => {
+                if tx.send(WatchEvent::TerminalResize).is_err() {
                     return;
                 }
             }
-            Ok(Event::FocusGained | Event::FocusLost | Event::Mouse(_)) => continue,
-            Err(e) => break WatchEvent::TerminalEventErr(e),
+            Event::FocusGained | Event::FocusLost | Event::Mouse(_) => continue,
         }
     };
 
-    let _ = sender.send(last_watch_event);
+    let _ = tx.send(WatchEvent::Input(last_input_event));
 }

tests/test_exercises/dev/Cargo.toml

@@ -7,5 +7,5 @@ bin = [
 
 [package]
 name = "test_exercises"
-edition = "2024"
+edition = "2021"
 publish = false

website/.gitignore

@@ -1,7 +0,0 @@
-/node_modules/
-/package-lock.json
-
-/public/
-
-/static/main.css
-/static/processed_images/

website/config.toml

@@ -1,41 +0,0 @@
-base_url = "https://rustlings.rust-lang.org"
-title = "Rustlings"
-description = "Small exercises to get you used to reading and writing Rust code!"
-
-compile_sass = false
-build_search_index = false
-
-[markdown]
-highlight_code = true
-highlight_theme = "dracula"
-
-insert_anchor_links = "heading"
-
-[extra]
-logo_path = "images/happy_ferris.svg"
-
-[[extra.menu_items]]
-name = "Rustlings"
-url = "@/_index.md"
-[[extra.menu_items]]
-name = "Setup"
-url = "@/setup/index.md"
-[[extra.menu_items]]
-name = "Usage"
-url = "@/usage/index.md"
-[[extra.menu_items]]
-name = "Community Exercises"
-url = "@/community-exercises/index.md"
-[[extra.menu_items]]
-name = "Q&A"
-url = "https://github.com/rust-lang/rustlings/discussions/categories/q-a?discussions_q="
-
-[[extra.footer_items]]
-name = "Repository"
-url = "https://github.com/rust-lang/rustlings"
-[[extra.footer_items]]
-name = "Changelog"
-url = "https://github.com/rust-lang/rustlings/blob/main/CHANGELOG.md"
-[[extra.footer_items]]
-name = "MIT License"
-url = "https://github.com/rust-lang/rustlings/blob/main/LICENSE"

website/content/_index.md

@@ -1,21 +0,0 @@
-+++
-+++
-
-Small exercises to get you used to reading and writing [Rust](https://www.rust-lang.org) code - _Recommended in parallel to reading [the official Rust book](https://doc.rust-lang.org/book) 📚️_
-
-<script src="https://asciinema.org/a/719805.js" id="asciicast-719805" async="true"></script>
-
-## Quick start
-
-```bash
-# Installation
-cargo install rustlings
-# Initialization
-rustlings init
-# Moving into new directory
-cd rustlings
-# Starting Rustlings
-rustlings
-```
-
-Visit the [**setup**](@/setup/index.md) page for more details 🧰

website/content/community-exercises/index.md

@@ -1,73 +0,0 @@
-+++
-title = "Community Exercises"
-+++
-
-## List of Community Exercises
-
-- 🇯🇵 [Japanese Rustlings](https://github.com/sotanengel/rustlings-jp)：A Japanese translation of the Rustlings exercises.
-- 🇨🇳 [Simplified Chinese Rustlings](https://github.com/SandmeyerX/rustlings-zh-cn): A simplified Chinese translation of the Rustlings exercises.
-
-> You can use the same `rustlings` program that you installed with `cargo install rustlings` to run community exercises.
-
-## Creating Community Exercises
-
-Rustling's support for community exercises allows you to create your own exercises to focus on some specific topic.
-You could also offer a translation of the original Rustlings exercises as community exercises.
-
-### Getting Started
-
-To create community exercises, install Rustlings and run `rustlings dev new PROJECT_NAME`.
-This command will, similar to `cargo new PROJECT_NAME`, create the template directory `PROJECT_NAME` with all what you need to get started.
-
-_Read the comments_ in the generated `info.toml` file to understand its format.
-It allows you to set a custom welcome and final message and specify the metadata of every exercise.
-
-### Creating an Exercise
-
-Here is an example of the metadata of one exercise:
-
-```toml
-[[exercises]]
-name = "intro1"
-hint = """
-To finish this exercise, you need to …
-These links might help you …"""
-```
-
-After entering this in `info.toml`, create the file `intro1.rs` in the `exercises/` directory.
-The exercise needs to contain a `main` function, but it can be empty.
-Adding tests is recommended.
-Look at the official Rustlings exercises for inspiration.
-
-You can optionally add a solution file `intro1.rs` to the `solutions/` directory.
-
-Now, run `rustlings dev check`.
-It will tell you about any issues with your exercises.
-For example, it will tell you to run `rustlings dev update` to update the `Cargo.toml` file to include the new exercise `intro1`.
-
-`rustlings dev check` will also run your solutions (if you have any) to make sure that they run successfully.
-
-That's it!
-You finished your first exercise 🎉
-
-### Cargo.toml
-
-Except of the `bin` list, you can modify the `Cargo.toml` file as you want.
-
-> The `bin` list is automatically updated by running `rustlings dev update`
-
-- You can add dependencies in the `[dependencies]` table.
-- You might want to [configure some lints](https://doc.rust-lang.org/cargo/reference/manifest.html#the-lints-section) for all exercises. You can do so in the `[lints.rust]` and `[lints.clippy]` tables.
-
-### Publishing
-
-Now, add more exercises and publish them as a Git repository.
-
-Users just have to clone that repository and run `rustlings` in it to start working on your exercises (just like the official ones).
-
-One difference to the official exercises is that the solution files will not be hidden until the user finishes an exercise.
-But you can trust your users to not open the solution too early 😉
-
-### Sharing
-
-After publishing your community exercises, open an issue or a pull request in the [official Rustlings repository](https://github.com/rust-lang/rustlings) to add your project to the [list of community exercises](#list-of-community-exercises) 😃

website/content/setup/index.md

@@ -1,78 +0,0 @@
-+++
-title = "Setup"
-+++
-
-<!-- toc -->
-
-## Installing Rust
-
-Before installing Rustlings, you must have the **latest version of Rust** installed.
-Visit [www.rust-lang.org/tools/install](https://www.rust-lang.org/tools/install) for further instructions.
-This will also install _Cargo_, Rust's package/project manager.
-
-> 🐧 If you are on **Linux**, make sure you have `gcc` installed (_for a linker_).
->
-> Debian: `sudo apt install gcc`\
-> Fedora: `sudo dnf install gcc`
-
-> 🍎 If you are on **MacOS**, make sure you have _Xcode and its developer tools_ installed: `xcode-select --install`
-
-## Installing Rustlings
-
-The following command will download and compile Rustlings:
-
-```bash
-cargo install rustlings
-```
-
-{% details(summary="If the installation fails…") %}
-
-- Make sure you have the latest Rust version by running `rustup update`
-- Try adding the `--locked` flag: `cargo install rustlings --locked`
-- Otherwise, please [report the issue](https://github.com/rust-lang/rustlings/issues/new)
-
-{% end %}
-
-## Initialization
-
-After installing Rustlings, run the following command to initialize the `rustlings/` directory:
-
-```bash
-rustlings init
-```
-
-{% details(summary="If the command <code>rustlings</code> can't be found…") %}
-
-You are probably using Linux and installed Rust using your package manager.
-
-Cargo installs binaries to the directory `~/.cargo/bin`.
-Sadly, package managers often don't add `~/.cargo/bin` to your `PATH` environment variable.
-
-- Either add `~/.cargo/bin` manually to `PATH`
-- Or uninstall Rust from the package manager and [install it using the official way with `rustup`](https://www.rust-lang.org/tools/install)
-
-{% end %}
-
-Now, go into the newly initialized directory and launch Rustlings for further instructions on getting started with the exercises:
-
-```bash
-cd rustlings/
-rustlings
-```
-
-## Working environment
-
-### Editor
-
-Our general recommendation is [VS Code](https://code.visualstudio.com/) with the [rust-analyzer plugin](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer).
-But any editor that supports [rust-analyzer](https://rust-analyzer.github.io/) should be enough for working on the exercises.
-
-### Terminal
-
-While working with Rustlings, please use a modern terminal for the best user experience.
-The default terminal on Linux and Mac should be sufficient.
-On Windows, we recommend the [Windows Terminal](https://aka.ms/terminal).
-
-## Usage
-
-After being done with the setup, visit the [**usage**](@/usage/index.md) page for some info about using Rustlings 🚀