Merge pull request #2219 from ubitux/no-todo

Remove TODO from 2 solutions

.github/workflows/rust.yml

@@ -22,22 +22,22 @@ jobs:
       - uses: DavidAnson/markdownlint-cli2-action@v16
         with:
           globs: "exercises/**/*.md"
-      - name: Run cargo fmt
+      - name: rustfmt
         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: Run cargo test
+      - name: cargo test
         run: cargo test --workspace
   dev-check:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: swatinem/rust-cache@v2
-      - name: Run rustlings dev check
+      - name: rustlings dev check
         run: cargo run -- dev check --require-solutions

.typos.toml

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

CHANGELOG.md

@@ -1,3 +1,41 @@
+## Unreleased
+
+### Changed
+
+- Upgrade to Rust edition 2024
+- Raise the minimum supported Rust version to `1.85`
+
+<a name="6.4.0"></a>
+
+## 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 third-party 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)
@@ -113,7 +151,7 @@ You can read about the motivations of this change in [this issue](https://github
 
 ### List mode
 
-A list mode was added using [Ratatui](https://ratatui.rs).
+A new list mode was added!
 You can enter it by entering `l` in the watch mode.
 It offers the following features:
 
@@ -814,7 +852,7 @@ Then follow the link to the guide about [third-party exercises](THIRD_PARTY_EXER
 
 #### Bug Fixes
 
-- Update deps to version compatable with aarch64-pc-windows (#263) ([19a93428](https://github.com/rust-lang/rustlings/commit/19a93428b3c73d994292671f829bdc8e5b7b3401))
+- Update deps to version compatible 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))

Cargo.lock

@@ -1,24 +1,12 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if",
- "once_cell",
- "version_check",
- "zerocopy",
-]
+version = 4
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -31,49 +19,50 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "once_cell",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "bitflags"
@@ -83,9 +72,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
 
 [[package]]
 name = "cfg-if"
@@ -95,9 +84,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.5.16"
+version = "4.5.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
+checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -105,9 +94,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.15"
+version = "4.5.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
+checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9"
 dependencies = [
  "anstream",
  "anstyle",
@@ -117,9 +106,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.13"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -129,30 +118,15 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "crossterm"
@@ -160,11 +134,11 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "crossterm_winapi",
- "mio 1.0.2",
+ "mio",
  "parking_lot",
- "rustix",
+ "rustix 0.38.44",
  "signal-hook",
  "signal-hook-mio",
  "winapi",
@@ -181,25 +155,25 @@ dependencies = [
 
 [[package]]
 name = "equivalent"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "fastrand"
-version = "2.1.1"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "filetime"
@@ -223,10 +197,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "hashbrown"
-version = "0.14.5"
+name = "getrandom"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 
 [[package]]
 name = "heck"
@@ -234,17 +220,11 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "hermit-abi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-
 [[package]]
 name = "indexmap"
-version = "2.4.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c"
+checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -252,11 +232,11 @@ dependencies = [
 
 [[package]]
 name = "inotify"
-version = "0.9.6"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
+checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.9.0",
  "inotify-sys",
  "libc",
 ]
@@ -278,9 +258,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "kqueue"
@@ -304,9 +284,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
 
 [[package]]
 name = "libredox"
@@ -314,16 +294,22 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "libc",
  "redox_syscall",
 ]
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
 
 [[package]]
 name = "lock_api"
@@ -337,9 +323,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "memchr"
@@ -349,63 +335,46 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
  "libc",
  "log",
- "wasi",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "mio"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
-dependencies = [
- "hermit-abi",
- "libc",
- "log",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "notify"
-version = "6.1.1"
+version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
+checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
 dependencies = [
- "bitflags 2.6.0",
- "crossbeam-channel",
+ "bitflags 2.9.0",
  "filetime",
  "fsevent-sys",
  "inotify",
  "kqueue",
  "libc",
  "log",
- "mio 0.8.11",
+ "mio",
+ "notify-types",
  "walkdir",
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
-name = "notify-debouncer-mini"
-version = "0.4.1"
+name = "notify-types"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d40b221972a1fc5ef4d858a2f671fb34c75983eb385463dff3780eeff6a9d43"
-dependencies = [
- "log",
- "notify",
-]
+checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d"
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "os_pipe"
@@ -437,59 +406,78 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets 0.52.6",
+ "windows-targets",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
-name = "redox_syscall"
-version = "0.5.3"
+name = "r-efi"
+version = "5.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.38.35"
+version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.9.0",
  "errno",
  "libc",
- "linux-raw-sys",
- "windows-sys 0.52.0",
+ "linux-raw-sys 0.4.15",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustix"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
+dependencies = [
+ "bitflags 2.9.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.9.3",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "rustlings"
-version = "6.3.0"
+version = "6.4.0"
 dependencies = [
- "ahash",
  "anyhow",
  "clap",
  "crossterm",
- "notify-debouncer-mini",
+ "notify",
  "os_pipe",
+ "rustix 1.0.5",
  "rustlings-macros",
  "serde",
  "serde_json",
@@ -499,7 +487,7 @@ dependencies = [
 
 [[package]]
 name = "rustlings-macros"
-version = "6.3.0"
+version = "6.4.0"
 dependencies = [
  "quote",
  "serde",
@@ -508,9 +496,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "same-file"
@@ -529,18 +517,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -549,9 +537,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
  "itoa",
  "memchr",
@@ -561,9 +549,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -585,7 +573,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
 dependencies = [
  "libc",
- "mio 1.0.2",
+ "mio",
  "signal-hook",
 ]
 
@@ -600,9 +588,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
 
 [[package]]
 name = "strsim"
@@ -612,9 +600,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
-version = "2.0.76"
+version = "2.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -623,14 +611,14 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.12.0"
+version = "3.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
 dependencies = [
- "cfg-if",
  "fastrand",
+ "getrandom",
  "once_cell",
- "rustix",
+ "rustix 1.0.5",
  "windows-sys 0.59.0",
 ]
 
@@ -645,9 +633,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
 dependencies = [
  "indexmap",
  "serde",
@@ -658,9 +646,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
 [[package]]
 name = "utf8parse"
@@ -668,12 +656,6 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
-[[package]]
-name = "version_check"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
 [[package]]
 name = "walkdir"
 version = "2.5.0"
@@ -690,6 +672,15 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.14.2+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -721,22 +712,13 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-targets",
 ]
 
 [[package]]
@@ -745,22 +727,7 @@ version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
+ "windows-targets",
 ]
 
 [[package]]
@@ -769,46 +736,28 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
  "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
@@ -821,48 +770,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
@@ -871,29 +796,18 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.6.18"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
+checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "zerocopy"
-version = "0.7.35"
+name = "wit-bindgen-rt"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
 dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "bitflags 2.9.0",
 ]

Cargo.toml

@@ -6,7 +6,7 @@ exclude = [
 ]
 
 [workspace.package]
-version = "6.3.0"
+version = "6.4.0"
 authors = [
   "Mo Bitar <mo8it@proton.me>", # https://github.com/mo8it
   "Liv <mokou@fastmail.com>", # https://github.com/shadows-withal
@@ -15,12 +15,12 @@ authors = [
 ]
 repository = "https://github.com/rust-lang/rustlings"
 license = "MIT"
-edition = "2021" # On Update: Update the edition of the `rustfmt` command that checks the solutions.
-rust-version = "1.80"
+edition = "2024" # On Update: Update the edition of `rustfmt` in `dev check` and `CARGO_TOML` in `dev new`.
+rust-version = "1.85"
 
 [workspace.dependencies]
-serde = { version = "1.0.209", features = ["derive"] }
-toml_edit = { version = "0.22.20", default-features = false, features = ["parse", "serde"] }
+serde = { version = "1.0", features = ["derive"] }
+toml_edit = { version = "0.22", default-features = false, features = ["parse", "serde"] }
 
 [package]
 name = "rustlings"
@@ -46,19 +46,21 @@ include = [
 ]
 
 [dependencies]
-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"
+anyhow = "1.0"
+clap = { version = "4.5", features = ["derive"] }
+crossterm = { version = "0.28", default-features = false, features = ["windows", "events"] }
+notify = "8.0"
+os_pipe = "1.2"
+rustlings-macros = { path = "rustlings-macros", version = "=6.4.0" }
+serde_json = "1.0"
 serde.workspace = true
 toml_edit.workspace = true
 
+[target.'cfg(not(windows))'.dependencies]
+rustix = { version = "1.0", default-features = false, features = ["std", "stdio", "termios"] }
+
 [dev-dependencies]
-tempfile = "3.12.0"
+tempfile = "3.19"
 
 [profile.release]
 panic = "abort"
@@ -68,6 +70,7 @@ panic = "abort"
 
 [package.metadata.release]
 pre-release-hook = ["./release-hook.sh"]
+pre-release-commit-message = "Release 🎉"
 
 [workspace.lints.rust]
 unsafe_code = "forbid"

README.md

@@ -21,12 +21,13 @@ Before installing Rustlings, you need to have the **latest version of Rust** ins
 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).
+> 🐧 If you are on Linux, make sure you have installed `gcc` (for a linker).
 >
-> Deb: `sudo apt install gcc`.
-> Dnf: `sudo dnf install gcc`.
+> 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`.
+> 🍎 If you are on MacOS, make sure you have installed Xcode and its developer tools by running `xcode-select --install`.
 
 ### Installing Rustlings
 
@@ -102,7 +103,7 @@ 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`.
+After the [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.
@@ -124,21 +125,31 @@ 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)
+- `r`: Reset status and file of the selected exercise (you need to _reload/reopen_ its file in your editor afterwards)
 
 See the footer of the list for all possible keys.
 
+## Questions?
+
+If you need any help while doing the exercises and the builtin-hints aren't helpful, feel free to ask in the [_Q&A_ category of the discussions](https://github.com/rust-lang/rustlings/discussions/categories/q-a?discussions_q=) if your question wasn't asked yet 💡
+
+## Third-Party Exercises
+
+Third-party exercises are a set of exercises maintained by the community.
+You can use the same `rustlings` program that you installed with `cargo install rustlings` to run them:
+
+- 🇯🇵 [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.
+
+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 the guide about [third-party exercises](https://github.com/rust-lang/rustlings/blob/main/THIRD_PARTY_EXERCISES.md)!
+
 ## 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:
@@ -151,6 +162,4 @@ cargo uninstall rustlings
 
 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) 🎉
+Thanks to [all the wonderful contributors](https://github.com/rust-lang/rustlings/graphs/contributors) ✨

build.rs

@@ -0,0 +1,5 @@
+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

@@ -5,9 +5,11 @@ disallowed-types = [
 ]
 
 disallowed-methods = [
-  # We use `ahash` instead of the default hasher.
-  "std::collections::HashSet::new",
-  "std::collections::HashSet::with_capacity",
   # Inefficient. Use `.queue(…)` instead.
   "crossterm::style::style",
+  # Use `thread::Builder::spawn` instead and handle the error.
+  "std::thread::spawn",
+  "std::thread::Scope::spawn",
+  # Return `ExitCode` instead.
+  "std::process::exit",
 ]

dev/Cargo.toml

@@ -192,7 +192,7 @@ bin = [
 
 [package]
 name = "exercises"
-edition = "2021"
+edition = "2024"
 # Don't publish the exercises on crates.io!
 publish = false
 
@@ -203,17 +203,21 @@ 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/03_if/if2.rs

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

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/ch18-03-pattern-syntax.html)
+- [Pattern syntax](https://doc.rust-lang.org/book/ch19-03-pattern-syntax.html)

exercises/08_enums/enums2.rs

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

exercises/08_enums/enums3.rs

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

exercises/10_modules/modules2.rs

@@ -1,7 +1,6 @@
 // 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::new();
+    let mut scores = HashMap::<&str, TeamScores>::new();
 
     for line in results.lines() {
         let mut split_iterator = line.split(',');

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!("Co-ordinates are {},{}", p.x, p.y),
+        Some(p) => println!("Coordinates 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/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,5 +1,3 @@
-#![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/19_smart_pointers/rc1.rs

@@ -8,7 +8,6 @@ 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 run for at least 250ms, and
-// each thread returns how much time they took to complete. The program should
+// This program spawns multiple threads that each runs for at least 250ms, and
+// each thread returns how much time it 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,5 +10,6 @@ of exercises to Rustlings, but is all about learning to write Macros.
 
 ## Further information
 
-- [Macros](https://doc.rust-lang.org/book/ch19-06-macros.html)
+- [The Rust Book - Macros](https://doc.rust-lang.org/book/ch20-05-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

@@ -4,9 +4,11 @@
 #[rustfmt::skip]
 #[allow(unused_variables, unused_assignments)]
 fn main() {
-    let my_option: Option<()> = None;
+    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.
     if my_option.is_none() {
-        println!("{:?}", my_option.unwrap());
+        println!("{}", my_option.unwrap());
     }
 
     let my_arr = &[

exercises/23_conversions/as_ref_mut.rs

@@ -2,10 +2,11 @@
 // 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.
+// Obtain the number of bytes (not characters) in the given argument
+// (`.len()` returns the number of bytes in a string).
 // TODO: Add the `AsRef` trait appropriately as a trait bound.
 fn byte_counter<T>(arg: T) -> usize {
-    arg.as_ref().as_bytes().len()
+    arg.as_ref().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 `From` implementation to be able to parse a `Person`
+// TODO: Complete this `FromStr` 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>()`.

release-hook.sh

@@ -11,3 +11,6 @@ cargo clippy -- --deny warnings
 cargo fmt --all --check
 cargo test --workspace --all-targets
 cargo run -- dev check --require-solutions
+
+# MSRV
+cargo +1.85 run -- dev check --require-solutions

rustlings-macros/Cargo.toml

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

rustlings-macros/info.toml

@@ -1,6 +1,7 @@
 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:
 
@@ -10,15 +11,16 @@ 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!
 
@@ -120,10 +122,10 @@ dir = "01_variables"
 test = false
 hint = """
 We know about variables and mutability, but there is another important type of
-variables available: constants.
+variable 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.
 
@@ -253,7 +255,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?"; 10];
+let array = ["Are we there yet?"; 100];
 ```
 
 Bonus: what are some other things you could have that would return `true`
@@ -319,7 +321,8 @@ hint = """
 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.
+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.
@@ -332,8 +335,8 @@ What do you think is the more commonly used pattern under Rust developers?"""
 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).
@@ -369,7 +372,8 @@ 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]]
@@ -508,7 +512,8 @@ 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");`
@@ -570,12 +575,8 @@ 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_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 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 2: If there is already an entry for a given key, the value returned by
         `entry()` can be updated based on the existing value.
@@ -1139,7 +1140,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"
@@ -1200,7 +1201,8 @@ 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"

solutions/03_if/if1.rs

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

solutions/06_move_semantics/move_semantics4.rs

@@ -4,8 +4,6 @@ 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,5 +1,3 @@
-#![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(s) => self.echo(s),
-            Message::ChangeColor(r, g, b) => self.change_color(r, g, b),
+            Message::Echo(string) => self.echo(string),
+            Message::ChangeColor(red, green, blue) => self.change_color(red, green, blue),
             Message::Quit => self.quit(),
         }
     }

solutions/10_modules/modules2.rs

@@ -1,4 +1,3 @@
-#[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/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::new();
+    let mut scores = HashMap::<&str, TeamScores>::new();
 
     for line in results.lines() {
         let mut split_iterator = line.split(',');
@@ -28,17 +28,13 @@ 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_insert_with(TeamScores::default);
+        let team_1 = scores.entry(team_1_name).or_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_insert_with(TeamScores::default);
+        let team_2 = scores.entry(team_2_name).or_default();
         team_2.goals_scored += team_2_score;
         team_2.goals_conceded += team_1_score;
     }
@@ -64,9 +60,11 @@ 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/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!("Co-ordinates are {},{}", p.x, p.y),
+        Some(ref p) => println!("Coordinates are {},{}", p.x, p.y),
         //   ^^^ added
         _ => panic!("No match!"),
     }
@@ -18,7 +18,8 @@ fn main() {
     // Solution 2: Matching over a reference (`&Option`) by added `&` before
     // `optional_point`.
     match &optional_point {
-        Some(p) => println!("Co-ordinates are {},{}", p.x, p.y),
+        //^ added
+        Some(p) => println!("Coordinates 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)]
+#[allow(unused_variables, clippy::question_mark)]
 fn total_cost(item_quantity: &str) -> Result<i32, ParseIntError> {
     let processing_fee = 1;
     let cost_per_item = 5;

solutions/13_error_handling/errors6.rs

@@ -29,6 +29,21 @@ 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,5 +1,3 @@
-#![allow(dead_code)]
-
 trait Licensed {
     fn licensing_info(&self) -> String {
         "Default license".to_string()

solutions/16_lifetimes/lifetimes1.rs

@@ -5,11 +5,7 @@
 
 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,9 +1,5 @@
 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/19_smart_pointers/rc1.rs

@@ -8,7 +8,6 @@ use std::rc::Rc;
 #[derive(Debug)]
 struct Sun;
 
-#[allow(dead_code)]
 #[derive(Debug)]
 enum Planet {
     Mercury(Rc<Sun>),
@@ -64,12 +63,10 @@ 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 run for at least 250ms, and
-// each thread returns how much time they took to complete. The program should
+// This program spawns multiple threads that each runs for at least 250ms, and
+// each thread returns how much time it took to complete. The program should
 // wait until all the spawned threads have finished and should collect their
 // return values into a vector.
 

solutions/22_clippy/clippy3.rs

@@ -3,11 +3,11 @@ use std::mem;
 #[rustfmt::skip]
 #[allow(unused_variables, unused_assignments)]
 fn main() {
-    let my_option: Option<()> = None;
+    let my_option: Option<&str> = 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.

solutions/23_conversions/as_ref_mut.rs

@@ -2,9 +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.
+// Obtain the number of bytes (not characters) in the given argument
+// (`.len()` returns the number of bytes in a string).
 fn byte_counter<T: AsRef<str>>(arg: T) -> usize {
-    arg.as_ref().as_bytes().len()
+    arg.as_ref().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::my_module::transformer_iter;
     use super::Command;
+    use super::my_module::transformer_iter;
 
     #[test]
     fn it_works() {

src/app_state.rs

@@ -1,32 +1,39 @@
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Error, Result, bail};
+use crossterm::{QueueableCommand, cursor, terminal};
 use std::{
+    collections::HashSet,
     env,
     fs::{File, OpenOptions},
-    io::{self, Read, Seek, StdoutLock, Write},
-    path::Path,
+    io::{Read, Seek, StdoutLock, Write},
+    path::{MAIN_SEPARATOR_STR, 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 {
@@ -34,10 +41,12 @@ pub enum StateFileStatus {
     NotRead,
 }
 
-enum AllExercisesCheck {
-    Pending(usize),
-    AllDone,
-    CheckedUntil(usize),
+#[derive(Clone, Copy)]
+pub enum CheckProgress {
+    None,
+    Checking,
+    Done,
+    Pending,
 }
 
 pub struct AppState {
@@ -71,6 +80,7 @@ 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| {
@@ -82,10 +92,32 @@ 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,
@@ -114,13 +146,13 @@ impl AppState {
                 break 'block StateFileStatus::NotRead;
             }
 
-            let mut done_exercises = hash_set_with_capacity(exercises.len());
+            let mut done_exercises = HashSet::with_capacity(exercises.len());
 
-            for done_exerise_name in lines {
-                if done_exerise_name.is_empty() {
+            for done_exercise_name in lines {
+                if done_exercise_name.is_empty() {
                     break;
                 }
-                done_exercises.insert(done_exerise_name);
+                done_exercises.insert(done_exercise_name);
             }
 
             for (ind, exercise) in exercises.iter_mut().enumerate() {
@@ -170,6 +202,11 @@ 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]
@@ -246,15 +283,31 @@ impl AppState {
         self.write()
     }
 
-    pub fn set_pending(&mut self, exercise_ind: usize) -> Result<()> {
+    // 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> {
         let exercise = self
             .exercises
             .get_mut(exercise_ind)
             .context(BAD_INDEX_ERR)?;
 
-        if exercise.done {
-            exercise.done = false;
+        if exercise.done == done {
+            return Ok(false);
+        }
+
+        exercise.done = done;
+        if done {
+            self.n_done += 1;
+        } else {
             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()?;
         }
 
@@ -331,7 +384,7 @@ impl AppState {
             })
     }
 
-    /// Official exercises: Dump the solution file form the binary and return its path.
+    /// Official exercises: Dump the solution file from 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) {
@@ -355,62 +408,125 @@ impl AppState {
         }
     }
 
-    // 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();
+    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)?;
 
-        let status = thread::scope(|s| {
-            let handles = self
-                .exercises
-                .iter()
-                .map(|exercise| s.spawn(|| exercise.run_exercise(None, &self.cmd_runner)))
-                .collect::<Vec<_>>();
+        let next_exercise_ind = AtomicUsize::new(0);
+        let mut progresses = vec![CheckProgress::None; self.exercises.len()];
 
-            for (exercise_ind, handle) in handles.into_iter().enumerate() {
-                write!(stdout, "\rProgress: {exercise_ind}/{n_exercises}")?;
-                stdout.flush()?;
+        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());
 
-                let Ok(success) = handle.join().unwrap() else {
-                    return Ok(AllExercisesCheck::CheckedUntil(exercise_ind));
-                };
+            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;
+                            };
 
-                if !success {
-                    return Ok(AllExercisesCheck::Pending(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")?;
             }
 
-            Ok::<_, io::Error>(AllExercisesCheck::AllDone)
+            // 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>(())
         })?;
 
-        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 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)?;
 
-        // 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));
+                    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)?;
+                }
             }
-
-            exercise_ind += 1;
         }
 
-        Ok(None)
+        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
     }
 
     /// 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(&mut self, stdout: &mut StdoutLock) -> Result<ExercisesProgress> {
+    pub fn done_current_exercise<const CLEAR_BEFORE_FINAL_CHECK: bool>(
+        &mut self,
+        stdout: &mut StdoutLock,
+    ) -> Result<ExercisesProgress> {
         let exercise = &mut self.exercises[self.current_exercise_ind];
         if !exercise.done {
             exercise.done = true;
@@ -422,20 +538,24 @@ impl AppState {
             return Ok(ExercisesProgress::NewPending);
         }
 
-        if let Some(pending_exercise_ind) = self.check_all_exercises(stdout)? {
-            stdout.write_all(b"\n\n")?;
+        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)?;
 
-            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);
         }
 
-        // Write that the last exercise is done.
-        self.write()?;
+        self.render_final_message(stdout)?;
 
+        Ok(ExercisesProgress::AllDone)
+    }
+
+    pub fn render_final_message(&self, stdout: &mut StdoutLock) -> Result<()> {
         clear_terminal(stdout)?;
         stdout.write_all(FENISH_LINE.as_bytes())?;
 
@@ -445,16 +565,12 @@ impl AppState {
             stdout.write_all(b"\n")?;
         }
 
-        Ok(ExercisesProgress::AllDone)
+        Ok(())
     }
 }
 
 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!          |
 +--------------------------  ------------------------+
@@ -486,6 +602,7 @@ mod tests {
             dir: None,
             name: "0",
             path: "exercises/0.rs",
+            canonical_path: None,
             test: false,
             strict_clippy: false,
             hint: "",

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[..bins_start_ind].as_bytes());
+    updated_cargo_toml.extend_from_slice(&current_cargo_toml.as_bytes()[..bins_start_ind]);
     append_bins(
         &mut updated_cargo_toml,
         exercise_infos,
         exercise_path_prefix,
     );
-    updated_cargo_toml.extend_from_slice(current_cargo_toml[bins_end_ind..].as_bytes());
+    updated_cargo_toml.extend_from_slice(&current_cargo_toml.as_bytes()[bins_end_ind..]);
 
     Ok(updated_cargo_toml)
 }

src/cmd.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use serde::Deserialize;
 use std::{
     io::Read,
@@ -125,7 +125,7 @@ pub struct CargoSubcommand<'out> {
     output: Option<&'out mut Vec<u8>>,
 }
 
-impl<'out> CargoSubcommand<'out> {
+impl CargoSubcommand<'_> {
     #[inline]
     pub fn args<'arg, I>(&mut self, args: I) -> &mut Self
     where

src/collections.rs

@@ -1,10 +0,0 @@
-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::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use clap::Subcommand;
 use std::path::PathBuf;
 

src/dev/check.rs

@@ -1,7 +1,8 @@
-use anyhow::{anyhow, bail, Context, Error, Result};
+use anyhow::{Context, Error, Result, anyhow, bail};
 use std::{
     cmp::Ordering,
-    fs::{self, read_dir, OpenOptions},
+    collections::HashSet,
+    fs::{self, OpenOptions, read_dir},
     io::{self, Read, Write},
     path::{Path, PathBuf},
     process::{Command, Stdio},
@@ -9,14 +10,14 @@ use std::{
 };
 
 use crate::{
-    cargo_toml::{append_bins, bins_start_end_ind, BINS_BUFFER_CAPACITY},
-    cmd::CmdRunner,
-    collections::{hash_set_with_capacity, HashSet},
-    exercise::{RunnableExercise, OUTPUT_CAPACITY},
-    info_file::{ExerciseInfo, InfoFile},
     CURRENT_FORMAT_VERSION,
+    cargo_toml::{BINS_BUFFER_CAPACITY, append_bins, bins_start_end_ind},
+    cmd::CmdRunner,
+    exercise::{OUTPUT_CAPACITY, RunnableExercise},
+    info_file::{ExerciseInfo, InfoFile},
 };
 
+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`.
@@ -41,10 +42,14 @@ fn check_cargo_toml(
 
     if old_bins != new_bins {
         if cfg!(debug_assertions) {
-            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 `dev/Cargo.toml` is outdated. Run `cargo run -- dev update` to update it. Then run `cargo run -- dev check` again"
+            );
         }
 
-        bail!("The file `Cargo.toml` is outdated. Please run `rustlings dev update` to update it. Then run `rustlings dev check` again");
+        bail!(
+            "The file `Cargo.toml` is outdated. Run `rustlings dev update` to update it. Then run `rustlings dev check` again"
+        );
     }
 
     Ok(())
@@ -52,8 +57,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 = hash_set_with_capacity(info_file.exercises.len());
-    let mut paths = hash_set_with_capacity(info_file.exercises.len());
+    let mut names = HashSet::with_capacity(info_file.exercises.len());
+    let mut paths = HashSet::with_capacity(info_file.exercises.len());
 
     let mut file_buf = String::with_capacity(1 << 14);
     for exercise_info in &info_file.exercises {
@@ -62,7 +67,9 @@ 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");
@@ -78,7 +85,9 @@ 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) {
@@ -95,20 +104,28 @@ 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}`.\nCreate 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}`.\nYou 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();
@@ -124,7 +141,10 @@ 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"))? {
@@ -153,7 +173,10 @@ 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();
@@ -185,12 +208,14 @@ fn check_exercises_unsolved(
                 return None;
             }
 
-            Some((
-                exercise_info.name.as_str(),
-                thread::spawn(|| exercise_info.run_exercise(None, cmd_runner)),
-            ))
+            Some(
+                thread::Builder::new()
+                    .spawn(|| exercise_info.run_exercise(None, cmd_runner))
+                    .map(|handle| (exercise_info.name.as_str(), handle)),
+            )
         })
-        .collect::<Vec<_>>();
+        .collect::<Result<Vec<_>, _>>()
+        .context("Failed to spawn a thread to check if an exercise is already solved")?;
 
     let n_handles = handles.len();
     write!(stdout, "Progress: 0/{n_handles}")?;
@@ -199,7 +224,7 @@ fn check_exercises_unsolved(
 
     for (exercise_name, handle) in handles {
         let Ok(result) = handle.join() else {
-            bail!("Panic while trying to run the exericse {exercise_name}");
+            bail!("Panic while trying to run the exercise {exercise_name}");
         };
 
         match result {
@@ -221,12 +246,18 @@ fn check_exercises_unsolved(
 
 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)\nPlease migrate to the latest format version"),
-        Ordering::Greater => bail!("`format_version` > {CURRENT_FORMAT_VERSION} (supported version)\nTry 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::spawn(move || check_exercises_unsolved(info_file, cmd_runner));
+    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 info_file_paths = check_info_file_exercises(info_file)?;
     check_unexpected_files("exercises", &info_file_paths)?;
@@ -253,7 +284,7 @@ fn check_solutions(
         .exercises
         .iter()
         .map(|exercise_info| {
-            thread::spawn(move || {
+            thread::Builder::new().spawn(move || {
                 let sol_path = exercise_info.sol_path();
                 if !Path::new(&sol_path).exists() {
                     if require_solutions {
@@ -274,14 +305,15 @@ fn check_solutions(
                 }
             })
         })
-        .collect::<Vec<_>>();
+        .collect::<Result<Vec<_>, _>>()
+        .context("Failed to spawn a thread to check a solution")?;
 
-    let mut sol_paths = hash_set_with_capacity(info_file.exercises.len());
+    let mut sol_paths = HashSet::with_capacity(info_file.exercises.len());
     let mut fmt_cmd = Command::new("rustfmt");
     fmt_cmd
         .arg("--check")
         .arg("--edition")
-        .arg("2021")
+        .arg("2024")
         .arg("--color")
         .arg("always")
         .stdin(Stdio::null());
@@ -294,7 +326,7 @@ fn check_solutions(
     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 exericse {}",
+                "Panic while trying to run the solution of the exercise {}",
                 exercise_info.name,
             );
         };
@@ -322,7 +354,11 @@ fn check_solutions(
     }
     stdout.write_all(b"\n")?;
 
-    let handle = thread::spawn(move || check_unexpected_files("solutions", &sol_paths));
+    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",
+        )?;
 
     if !fmt_cmd
         .status()
@@ -338,6 +374,10 @@ 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 run -- dev check` work when developing Rustlings.
         check_cargo_toml(&info_file.exercises, "dev/Cargo.toml", b"../")?;

src/dev/new.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use std::{
     env::set_current_dir,
     fs::{self, create_dir},
@@ -6,7 +6,7 @@ use std::{
     process::Command,
 };
 
-use crate::CURRENT_FORMAT_VERSION;
+use crate::{CURRENT_FORMAT_VERSION, init::RUST_ANALYZER_TOML};
 
 // Create a directory relative to the current directory and print its path.
 fn create_rel_dir(dir_name: &str, current_dir: &str) -> Result<()> {
@@ -55,13 +55,17 @@ 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",
@@ -128,7 +132,7 @@ bin = []
 
 [package]
 name = "exercises"
-edition = "2021"
+edition = "2024"
 # Don't publish the exercises on crates.io!
 publish = false
 

src/embedded.rs

@@ -1,7 +1,7 @@
 use anyhow::{Context, Error, Result};
 use std::{
-    fs::{create_dir, OpenOptions},
-    io::{self, Write},
+    fs::{self, create_dir},
+    io,
 };
 
 use crate::info_file::ExerciseInfo;
@@ -9,29 +9,6 @@ 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.
@@ -42,6 +19,16 @@ struct ExerciseFiles {
     dir_ind: usize,
 }
 
+fn create_dir_if_not_exists(path: &str) -> Result<()> {
+    if let Err(e) = create_dir(path) {
+        if 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,
@@ -55,21 +42,13 @@ impl ExerciseDir {
         let mut dir_path = String::with_capacity(20 + self.name.len());
         dir_path.push_str("exercises/");
         dir_path.push_str(self.name);
-
-        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}"))
-            );
-        }
+        create_dir_if_not_exists(&dir_path)?;
 
         let mut readme_path = dir_path;
         readme_path.push_str("/README.md");
 
-        WriteStrategy::Overwrite.write(&readme_path, self.readme)
+        fs::write(&readme_path, self.readme)
+            .with_context(|| format!("Failed to write the file {readme_path}"))
     }
 }
 
@@ -86,17 +65,31 @@ impl EmbeddedFiles {
     pub fn init_exercises_dir(&self, exercise_infos: &[ExerciseInfo]) -> Result<()> {
         create_dir("exercises").context("Failed to create the directory `exercises`")?;
 
-        WriteStrategy::IfNotExists.write(
+        fs::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) {
-            WriteStrategy::IfNotExists.write(&exercise_info.path(), exercise_files.exercise)?;
+            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}"))?;
         }
 
         Ok(())
@@ -107,7 +100,8 @@ impl EmbeddedFiles {
         let dir = &self.exercise_dirs[exercise_files.dir_ind];
 
         dir.init_on_disk()?;
-        WriteStrategy::Overwrite.write(path, exercise_files.exercise)
+        fs::write(path, exercise_files.exercise)
+            .with_context(|| format!("Failed to write the exercise file {path}"))
     }
 
     /// Write the solution file to disk and return its path.
@@ -116,19 +110,25 @@ 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 solution_path = String::with_capacity(14 + dir.name.len() + exercise_name.len());
-        solution_path.push_str("solutions/");
-        solution_path.push_str(dir.name);
+        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;
         solution_path.push('/');
         solution_path.push_str(exercise_name);
         solution_path.push_str(".rs");
 
-        WriteStrategy::Overwrite.write(&solution_path, exercise_files.solution)?;
+        fs::write(&solution_path, exercise_files.solution)
+            .with_context(|| format!("Failed to write the solution file {solution_path}"))?;
 
         Ok(solution_path)
     }

src/exercise.rs

@@ -1,13 +1,13 @@
 use anyhow::Result;
 use crossterm::{
-    style::{Attribute, Color, ResetColor, SetAttribute, SetForegroundColor},
     QueueableCommand,
+    style::{Attribute, Color, ResetColor, SetAttribute, SetForegroundColor},
 };
 use std::io::{self, StdoutLock, Write};
 
 use crate::{
     cmd::CmdRunner,
-    term::{terminal_file_link, write_ansi},
+    term::{self, CountedWrite, terminal_file_link, write_ansi},
 };
 
 /// The initial capacity of the output buffer.
@@ -18,7 +18,11 @@ pub fn solution_link_line(stdout: &mut StdoutLock, solution_path: &str) -> io::R
     stdout.write_all(b"Solution")?;
     stdout.queue(ResetColor)?;
     stdout.write_all(b" for comparison: ")?;
-    terminal_file_link(stdout, solution_path, Color::Cyan)?;
+    if let Some(canonical_path) = term::canonicalize(solution_path) {
+        terminal_file_link(stdout, solution_path, &canonical_path, Color::Cyan)?;
+    } else {
+        stdout.write_all(solution_path.as_bytes())?;
+    }
     stdout.write_all(b"\n")
 }
 
@@ -60,12 +64,23 @@ 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>) -> io::Result<()> {
+        if let Some(canonical_path) = self.canonical_path.as_deref() {
+            return terminal_file_link(writer, self.path, canonical_path, Color::Blue);
+        }
+
+        writer.write_str(self.path)
+    }
+}
+
 pub trait RunnableExercise {
     fn name(&self) -> &str;
     fn dir(&self) -> Option<&str>;
@@ -116,7 +131,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::{bail, Context, Error, Result};
+use anyhow::{Context, Error, Result, bail};
 use serde::Deserialize;
 use std::{fs, io::ErrorKind};
 

src/init.rs

@@ -1,7 +1,7 @@
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use crossterm::{
-    style::{Attribute, Color, ResetColor, SetAttribute, SetForegroundColor},
     QueueableCommand,
+    style::{Attribute, Color, ResetColor, SetAttribute, SetForegroundColor},
 };
 use serde::Deserialize;
 use std::{
@@ -57,7 +57,9 @@ pub fn init() -> Result<()> {
         if !workspace_manifest_content.contains("[workspace]\n")
             && !workspace_manifest_content.contains("workspace.")
         {
-            bail!("The current directory is already part of a Cargo project.\nPlease 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.\nPress ENTER to continue ")?;
@@ -75,7 +77,9 @@ pub fn init() -> Result<()> {
             .stdout(Stdio::null())
             .status()?;
         if !status.success() {
-            bail!("Failed to initialize a new Cargo workspace member.\nPlease 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")?;
@@ -130,6 +134,9 @@ 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`")?;
 
@@ -169,6 +176,10 @@ const INIT_SOLUTION_FILE: &[u8] = b"fn main() {
 }
 ";
 
+pub const RUST_ANALYZER_TOML: &[u8] = br#"check.command = "clippy"
+check.extraArgs = ["--profile", "test"]
+"#;
+
 const GITIGNORE: &[u8] = b"Cargo.lock
 target/
 .vscode/

src/list.rs

@@ -1,14 +1,13 @@
 use anyhow::{Context, Result};
 use crossterm::{
-    cursor,
+    QueueableCommand, cursor,
     event::{
         self, DisableMouseCapture, EnableMouseCapture, Event, KeyCode, KeyEventKind, MouseEventKind,
     },
     terminal::{
-        disable_raw_mode, enable_raw_mode, DisableLineWrap, EnableLineWrap, EnterAlternateScreen,
-        LeaveAlternateScreen,
+        DisableLineWrap, EnableLineWrap, EnterAlternateScreen, LeaveAlternateScreen,
+        disable_raw_mode, enable_raw_mode,
     },
-    QueueableCommand,
 };
 use std::io::{self, StdoutLock, Write};
 
@@ -20,7 +19,8 @@ mod scroll_state;
 mod state;
 
 fn handle_list(app_state: &mut AppState, stdout: &mut StdoutLock) -> Result<()> {
-    let mut list_state = ListState::new(app_state, stdout)?;
+    let mut list_state = ListState::build(app_state, stdout)?;
+    let mut is_searching = false;
 
     loop {
         match event::read().context("Failed to read terminal event")? {
@@ -32,6 +32,27 @@ 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(),
@@ -50,15 +71,15 @@ fn handle_list(app_state: &mut AppState, stdout: &mut StdoutLock) -> Result<()>
                         }
                     }
                     KeyCode::Char('p') => {
-                        let message = if list_state.filter() == Filter::Pending {
+                        if list_state.filter() == Filter::Pending {
                             list_state.set_filter(Filter::None);
-                            "Disabled filter PENDING"
+                            list_state.message.push_str("Disabled filter PENDING");
                         } else {
                             list_state.set_filter(Filter::Pending);
-                            "Enabled filter PENDING │ Press p again to disable the filter"
-                        };
-
-                        list_state.message.push_str(message);
+                            list_state.message.push_str(
+                                "Enabled filter PENDING │ Press p again to disable the filter",
+                            );
+                        }
                     }
                     KeyCode::Char('r') => list_state.reset_selected()?,
                     KeyCode::Char('c') => {
@@ -66,6 +87,10 @@ 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
     }
 
-    fn set_selected(&mut self, selected: usize) {
+    pub fn set_selected(&mut self, selected: usize) {
         self.selected = Some(selected);
         self.update_offset();
     }

src/list/state.rs

@@ -1,9 +1,11 @@
 use anyhow::{Context, Result};
 use crossterm::{
-    cursor::{MoveTo, MoveToNextLine},
-    style::{Attribute, Color, ResetColor, SetAttribute, SetBackgroundColor, SetForegroundColor},
-    terminal::{self, BeginSynchronizedUpdate, Clear, ClearType, EndSynchronizedUpdate},
     QueueableCommand,
+    cursor::{MoveTo, MoveToNextLine},
+    style::{
+        Attribute, Attributes, Color, ResetColor, SetAttribute, SetAttributes, SetForegroundColor,
+    },
+    terminal::{self, BeginSynchronizedUpdate, Clear, ClearType, EndSynchronizedUpdate},
 };
 use std::{
     fmt::Write as _,
@@ -13,12 +15,15 @@ use std::{
 use crate::{
     app_state::AppState,
     exercise::Exercise,
-    term::{progress_bar, terminal_file_link, CountedWrite, MaxLenWriter},
+    term::{CountedWrite, MaxLenWriter, progress_bar},
 };
 
 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
@@ -37,48 +42,53 @@ 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 new(app_state: &'a mut AppState, stdout: &mut StdoutLock) -> io::Result<Self> {
+    pub fn build(app_state: &'a mut AppState, stdout: &mut StdoutLock) -> Result<Self> {
         stdout.queue(Clear(ClearType::All))?;
 
         let name_col_title_len = 4;
-        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 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_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()?;
+        let (width, height) = terminal::size().context("Failed to get the 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,
         };
 
@@ -96,25 +106,39 @@ 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;
-        // 2 separator, 1 progress bar, 1-2 footer message.
-        let footer_height = 4 + u16::from(self.narrow_term);
+        // 1 progress bar, 2 footer message lines.
+        let footer_height = 3;
         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() {
+            if 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,
@@ -131,14 +155,12 @@ 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"  ")?;
             }
@@ -152,15 +174,16 @@ 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()..])?;
 
             // The list links aren't shown correctly in VS Code on Windows.
@@ -168,9 +191,11 @@ impl<'a> ListState<'a> {
             if self.app_state.vs_code() {
                 writer.write_str(exercise.path)?;
             } else {
-                terminal_file_link(&mut writer, exercise.path, Color::Blue)?;
+                exercise.terminal_file_link(&mut writer)?;
             }
 
+            writer.write_ascii(&self.path_col_padding[exercise.path.len()..])?;
+
             next_ln(stdout)?;
             stdout.queue(ResetColor)?;
             n_displayed_rows += 1;
@@ -208,9 +233,6 @@ 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(),
@@ -219,22 +241,15 @@ 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")?;
-                    if self.narrow_term {
-                        next_ln(stdout)?;
-                        writer = MaxLenWriter::new(stdout, self.term_width as usize);
+                    next_ln(stdout)?;
+                    writer = MaxLenWriter::new(stdout, self.term_width as usize);
 
-                        writer.write_ascii(b"filter ")?;
-                    } else {
-                        writer.write_ascii(b" | filter ")?;
-                    }
+                    writer.write_ascii(b"<s>earch | filter ")?;
                 } else {
                     // Nothing selected (and nothing shown), so only display filter and quit.
                     writer.write_ascii(b"filter ")?;
@@ -263,17 +278,14 @@ 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)?;
-
-                if self.narrow_term {
-                    next_ln(stdout)?;
-                }
             }
+
+            next_ln(stdout)?;
         }
 
         stdout.queue(EndSynchronizedUpdate)?.flush()
@@ -370,6 +382,33 @@ 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,19 +1,18 @@
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use app_state::StateFileStatus;
 use clap::{Parser, Subcommand};
 use std::{
     io::{self, IsTerminal, Write},
     path::Path,
-    process::exit,
+    process::ExitCode,
 };
 use term::{clear_terminal, press_enter_prompt};
 
-use self::{app_state::AppState, dev::DevCommands, info_file::InfoFile, watch::WatchExit};
+use self::{app_state::AppState, dev::DevCommands, info_file::InfoFile};
 
 mod app_state;
 mod cargo_toml;
 mod cmd;
-mod collections;
 mod dev;
 mod embedded;
 mod exercise;
@@ -47,6 +46,8 @@ 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
@@ -62,22 +63,26 @@ enum Subcommands {
     Dev(DevCommands),
 }
 
-fn main() -> Result<()> {
+fn main() -> Result<ExitCode> {
     let args = Args::parse();
 
     if cfg!(not(debug_assertions)) && Path::new("dev/rustlings-repo.txt").exists() {
         bail!("{OLD_METHOD_ERR}");
     }
 
-    match args.command {
-        Some(Subcommands::Init) => return init::init().context("Initialization failed"),
-        Some(Subcommands::Dev(dev_command)) => return dev_command.run(),
-        _ => (),
+    '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);
     }
 
     if !Path::new("exercises").is_dir() {
         println!("{PRE_INIT_MSG}");
-        exit(1);
+        return Ok(ExitCode::FAILURE);
     }
 
     let info_file = InfoFile::parse()?;
@@ -130,21 +135,41 @@ fn main() -> Result<()> {
                 )
             };
 
-            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)?,
-                }
-            }
+            watch::watch(&mut app_state, notify_exercise_names)?;
         }
         Some(Subcommands::Run { name }) => {
             if let Some(name) = name {
                 app_state.set_current_exercise_by_name(&name)?;
             }
-            run::run(&mut app_state)?;
+            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)?;
+                stdout.write_all(b"\n")?;
+
+                return Ok(ExitCode::FAILURE);
+            } else {
+                app_state.render_final_message(&mut stdout)?;
+            }
         }
         Some(Subcommands::Reset { name }) => {
             app_state.set_current_exercise_by_name(&name)?;
@@ -161,7 +186,7 @@ fn main() -> Result<()> {
         Some(Subcommands::Init | Subcommands::Dev(_)) => (),
     }
 
-    Ok(())
+    Ok(ExitCode::SUCCESS)
 }
 
 const OLD_METHOD_ERR: &str =

src/run.rs

@@ -1,20 +1,19 @@
 use anyhow::Result;
 use crossterm::{
-    style::{Color, ResetColor, SetForegroundColor},
     QueueableCommand,
+    style::{Color, ResetColor, SetForegroundColor},
 };
 use std::{
     io::{self, Write},
-    process::exit,
+    process::ExitCode,
 };
 
 use crate::{
     app_state::{AppState, ExercisesProgress},
-    exercise::{solution_link_line, RunnableExercise, OUTPUT_CAPACITY},
-    term::terminal_file_link,
+    exercise::{OUTPUT_CAPACITY, RunnableExercise, solution_link_line},
 };
 
-pub fn run(app_state: &mut AppState) -> Result<()> {
+pub fn run(app_state: &mut AppState) -> Result<ExitCode> {
     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())?;
@@ -26,9 +25,12 @@ pub fn run(app_state: &mut AppState) -> Result<()> {
         app_state.set_pending(app_state.current_exercise_ind())?;
 
         stdout.write_all(b"Ran ")?;
-        terminal_file_link(&mut stdout, app_state.current_exercise().path, Color::Blue)?;
+        app_state
+            .current_exercise()
+            .terminal_file_link(&mut stdout)?;
         stdout.write_all(b" with errors\n")?;
-        exit(1);
+
+        return Ok(ExitCode::FAILURE);
     }
 
     stdout.queue(SetForegroundColor(Color::Green))?;
@@ -43,14 +45,16 @@ pub fn run(app_state: &mut AppState) -> Result<()> {
         stdout.write_all(b"\n")?;
     }
 
-    match app_state.done_current_exercise(&mut stdout)? {
-        ExercisesProgress::CurrentPending | ExercisesProgress::NewPending => {
+    match app_state.done_current_exercise::<false>(&mut stdout)? {
+        ExercisesProgress::NewPending | ExercisesProgress::CurrentPending => {
             stdout.write_all(b"Next exercise: ")?;
-            terminal_file_link(&mut stdout, app_state.current_exercise().path, Color::Blue)?;
+            app_state
+                .current_exercise()
+                .terminal_file_link(&mut stdout)?;
             stdout.write_all(b"\n")?;
         }
         ExercisesProgress::AllDone => (),
     }
 
-    Ok(())
+    Ok(ExitCode::SUCCESS)
 }

src/term.rs

@@ -1,24 +1,25 @@
+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 crossterm::{
-    cursor::MoveTo,
-    style::{Attribute, Color, ResetColor, SetAttribute, SetForegroundColor},
-    terminal::{Clear, ClearType},
-    Command, QueueableCommand,
-};
+use crate::app_state::CheckProgress;
 
-pub struct MaxLenWriter<'a, 'b> {
-    pub stdout: &'a mut StdoutLock<'b>,
+pub struct MaxLenWriter<'a, 'lock> {
+    pub stdout: &'a mut StdoutLock<'lock>,
     len: usize,
     max_len: usize,
 }
 
-impl<'a, 'b> MaxLenWriter<'a, 'b> {
+impl<'a, 'lock> MaxLenWriter<'a, 'lock> {
     #[inline]
-    pub fn new(stdout: &'a mut StdoutLock<'b>, max_len: usize) -> Self {
+    pub fn new(stdout: &'a mut StdoutLock<'lock>, max_len: usize) -> Self {
         Self {
             stdout,
             len: 0,
@@ -33,13 +34,13 @@ impl<'a, 'b> MaxLenWriter<'a, 'b> {
     }
 }
 
-pub trait CountedWrite<'a> {
+pub trait CountedWrite<'lock> {
     fn write_ascii(&mut self, ascii: &[u8]) -> io::Result<()>;
     fn write_str(&mut self, unicode: &str) -> io::Result<()>;
-    fn stdout(&mut self) -> &mut StdoutLock<'a>;
+    fn stdout(&mut self) -> &mut StdoutLock<'lock>;
 }
 
-impl<'a, 'b> CountedWrite<'b> for MaxLenWriter<'a, 'b> {
+impl<'lock> CountedWrite<'lock> for MaxLenWriter<'_, 'lock> {
     fn write_ascii(&mut self, ascii: &[u8]) -> io::Result<()> {
         let n = ascii.len().min(self.max_len.saturating_sub(self.len));
         if n > 0 {
@@ -64,7 +65,7 @@ impl<'a, 'b> CountedWrite<'b> for MaxLenWriter<'a, 'b> {
     }
 
     #[inline]
-    fn stdout(&mut self) -> &mut StdoutLock<'b> {
+    fn stdout(&mut self) -> &mut StdoutLock<'lock> {
         self.stdout
     }
 }
@@ -86,33 +87,104 @@ impl<'a> CountedWrite<'a> for StdoutLock<'a> {
     }
 }
 
-/// Terminal progress bar to be used when not using Ratataui.
+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 fn progress_bar<'a>(
     writer: &mut impl CountedWrite<'a>,
     progress: u16,
     total: u16,
-    line_width: u16,
+    term_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;
-    // Leaving the last char empty (_) for `total` > 99.
-    const POSTFIX_WIDTH: u16 = "] xxx/xx exercises_".len() as u16;
+    const POSTFIX_WIDTH: u16 = "] xxx/xxx".len() as u16;
     const WRAPPER_WIDTH: u16 = PREFIX_WIDTH + POSTFIX_WIDTH;
     const MIN_LINE_WIDTH: u16 = WRAPPER_WIDTH + 4;
 
-    if line_width < MIN_LINE_WIDTH {
+    if term_width < MIN_LINE_WIDTH {
         writer.write_ascii(b"Progress: ")?;
         // Integers are in ASCII.
-        writer.write_ascii(format!("{progress}/{total}").as_bytes())?;
-        return writer.write_ascii(b" exercises");
+        return writer.write_ascii(format!("{progress}/{total}").as_bytes());
     }
 
     let stdout = writer.stdout();
     stdout.write_all(PREFIX)?;
 
-    let width = line_width - WRAPPER_WIDTH;
+    let width = term_width - WRAPPER_WIDTH;
     let filled = (width * progress) / total;
 
     stdout.queue(SetForegroundColor(Color::Green))?;
@@ -133,8 +205,9 @@ pub fn progress_bar<'a>(
         }
     }
 
-    stdout.queue(ResetColor)?;
-    write!(stdout, "] {progress:>3}/{total} exercises")
+    stdout.queue(SetForegroundColor(Color::Reset))?;
+
+    write!(stdout, "] {progress:>3}/{total}")
 }
 
 pub fn clear_terminal(stdout: &mut StdoutLock) -> io::Result<()> {
@@ -151,25 +224,29 @@ 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 terminal_file_link<'a>(
     writer: &mut impl CountedWrite<'a>,
     path: &str,
+    canonical_path: &str,
     color: Color,
 ) -> 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))?

src/watch.rs

@@ -1,106 +1,129 @@
 use anyhow::{Error, Result};
-use notify_debouncer_mini::{
-    new_debouncer,
-    notify::{self, RecursiveMode},
-};
+use notify::{Config, RecommendedWatcher, RecursiveMode, Watcher};
 use std::{
     io::{self, Write},
     path::Path,
-    sync::mpsc::channel,
-    thread,
+    sync::{
+        atomic::{AtomicBool, Ordering::Relaxed},
+        mpsc::channel,
+    },
     time::Duration,
 };
 
-use crate::app_state::{AppState, ExercisesProgress};
-
-use self::{
-    notify_event::NotifyEventHandler,
-    state::WatchState,
-    terminal_event::{terminal_event_handler, InputEvent},
+use crate::{
+    app_state::{AppState, ExercisesProgress},
+    list,
 };
 
+use self::{notify_event::NotifyEventHandler, state::WatchState, terminal_event::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,
+    TerminalResize { width: u16 },
     NotifyErr(notify::Error),
     TerminalEventErr(io::Error),
 }
 
 /// Returned by the watch mode to indicate what to do afterwards.
 #[must_use]
-pub enum WatchExit {
+enum WatchExit {
     /// Exit the program.
     Shutdown,
     /// Enter the list mode and restart the watch mode afterwards.
     List,
 }
 
-/// `notify_exercise_names` as None activates the manual run mode.
-pub fn watch(
+fn run_watch(
     app_state: &mut AppState,
     notify_exercise_names: Option<&'static [&'static [u8]]>,
 ) -> Result<WatchExit> {
-    let (tx, rx) = channel();
+    let (watch_event_sender, watch_event_receiver) = channel();
 
     let mut manual_run = false;
     // Prevent dropping the guard until the end of the function.
     // Otherwise, the file watcher exits.
-    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,
-            },
+    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)),
         )
         .inspect_err(|_| eprintln!("{NOTIFY_ERR}"))?;
-        debouncer
-            .watcher()
+
+        watcher
             .watch(Path::new("exercises"), RecursiveMode::Recursive)
             .inspect_err(|_| eprintln!("{NOTIFY_ERR}"))?;
 
-        Some(debouncer)
+        Some(watcher)
     } else {
         manual_run = true;
         None
     };
 
-    let mut watch_state = WatchState::new(app_state, manual_run);
-
+    let mut watch_state = WatchState::build(app_state, watch_event_sender, manual_run)?;
     let mut stdout = io::stdout().lock();
+
     watch_state.run_current_exercise(&mut stdout)?;
 
-    thread::spawn(move || terminal_event_handler(tx, manual_run));
-
-    while let Ok(event) = rx.recv() {
+    while let Ok(event) = watch_event_receiver.recv() {
         match event {
             WatchEvent::Input(InputEvent::Next) => match watch_state.next_exercise(&mut stdout)? {
                 ExercisesProgress::AllDone => break,
-                ExercisesProgress::CurrentPending => watch_state.render(&mut stdout)?,
                 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::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)?,
+            },
+            WatchEvent::Input(InputEvent::Reset) => watch_state.reset_exercise(&mut stdout)?,
             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 => watch_state.render(&mut stdout)?,
-            WatchEvent::NotifyErr(e) => {
-                return Err(Error::from(e).context(NOTIFY_ERR));
+            WatchEvent::TerminalResize { width } => {
+                watch_state.update_term_width(width, &mut stdout)?;
             }
+            WatchEvent::NotifyErr(e) => return Err(Error::from(e).context(NOTIFY_ERR)),
             WatchEvent::TerminalEventErr(e) => {
                 return Err(Error::from(e).context("Terminal event listener failed"));
             }
@@ -110,9 +133,52 @@ pub fn 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.
+If you want to continue working on the exercises at a later point, you can simply run `rustlings` again in this directory.
 ";
 
 const NOTIFY_ERR: &str = "

src/watch/notify_event.rs

@@ -1,52 +1,132 @@
-use notify_debouncer_mini::{DebounceEventResult, DebouncedEventKind};
-use std::sync::mpsc::Sender;
+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 super::WatchEvent;
+use super::{EXERCISE_RUNNING, WatchEvent};
+
+const DEBOUNCE_DURATION: Duration = Duration::from_millis(200);
 
 pub struct NotifyEventHandler {
-    pub tx: Sender<WatchEvent>,
-    /// Used to report which exercise was modified.
-    pub exercise_names: &'static [&'static [u8]],
+    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]],
 }
 
-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;
+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;
+                                }
+                            }
                         }
+                        Err(RecvTimeoutError::Disconnected) => break,
+                    }
+                }
+            })
+            .context("Failed to spawn a thread to debounce file changes")?;
 
-                        let file_name = input_event.path.file_name()?.to_str()?.as_bytes();
-
-                        if file_name.len() < 4 {
-                            return None;
-                        }
-                        let (file_name_without_ext, ext) = file_name.split_at(file_name.len() - 3);
-
-                        if ext != b".rs" {
-                            return None;
-                        }
-
-                        self.exercise_names
-                            .iter()
-                            .position(|exercise_name| *exercise_name == file_name_without_ext)
-                    })
-                    .min()
-                else {
-                    return;
-                };
-
-                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);
+        Ok(Self {
+            error_sender,
+            update_sender,
+            exercise_names,
+        })
+    }
+}
+
+impl notify::EventHandler for NotifyEventHandler {
+    fn handle_event(&mut self, input_event: notify::Result<Event>) {
+        if EXERCISE_RUNNING.load(Relaxed) {
+            return;
+        }
+
+        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;
+            }
+        };
+
+        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)
+            })
+            .try_for_each(|exercise_ind| self.update_sender.send(exercise_ind));
     }
 }

src/watch/state.rs

@@ -1,19 +1,30 @@
-use anyhow::Result;
+use anyhow::{Context, Result};
 use crossterm::{
+    QueueableCommand,
     style::{
         Attribute, Attributes, Color, ResetColor, SetAttribute, SetAttributes, SetForegroundColor,
     },
-    terminal, QueueableCommand,
+    terminal,
+};
+use std::{
+    io::{self, Read, StdoutLock, Write},
+    sync::mpsc::{Sender, SyncSender, sync_channel},
+    thread,
 };
-use std::io::{self, StdoutLock, Write};
 
 use crate::{
     app_state::{AppState, ExercisesProgress},
     clear_terminal,
-    exercise::{solution_link_line, RunnableExercise, OUTPUT_CAPACITY},
-    term::{progress_bar, terminal_file_link},
+    exercise::{OUTPUT_CAPACITY, RunnableExercise, solution_link_line},
+    term::progress_bar,
 };
 
+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),
@@ -27,20 +38,47 @@ 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 new(app_state: &'a mut AppState, manual_run: bool) -> Self {
-        Self {
+    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 {
             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!(
@@ -72,39 +110,67 @@ 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<()> {
-        // 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 {
+        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> {
-        if self.done_status == DoneStatus::Pending {
-            return Ok(ExercisesProgress::CurrentPending);
+        match self.done_status {
+            DoneStatus::DoneWithSolution(_) | DoneStatus::DoneWithoutSolution => (),
+            DoneStatus::Pending => return Ok(ExercisesProgress::CurrentPending),
         }
 
-        self.app_state.done_current_exercise(stdout)
+        self.app_state.done_current_exercise::<true>(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")?;
@@ -116,22 +182,25 @@ impl<'a> WatchState<'a> {
             stdout.write_all(b" / ")?;
         }
 
-        if !self.show_hint {
+        let mut show_key = |key, postfix| {
             stdout.queue(SetAttribute(Attribute::Bold))?;
-            stdout.write_all(b"h")?;
+            stdout.write_all(&[key])?;
             stdout.queue(ResetColor)?;
-            stdout.write_all(b":hint / ")?;
+            stdout.write_all(postfix)
+        };
+
+        if self.manual_run {
+            show_key(b'r', b":run / ")?;
         }
 
-        stdout.queue(SetAttribute(Attribute::Bold))?;
-        stdout.write_all(b"l")?;
-        stdout.queue(ResetColor)?;
-        stdout.write_all(b":list / ")?;
+        if !self.show_hint {
+            show_key(b'h', b":hint / ")?;
+        }
 
-        stdout.queue(SetAttribute(Attribute::Bold))?;
-        stdout.write_all(b"q")?;
-        stdout.queue(ResetColor)?;
-        stdout.write_all(b":quit ? ")?;
+        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.flush()
     }
@@ -145,9 +214,7 @@ impl<'a> WatchState<'a> {
 
         if self.show_hint {
             stdout
-                .queue(SetAttributes(
-                    Attributes::from(Attribute::Bold).with(Attribute::Underlined),
-                ))?
+                .queue(SetAttributes(HEADING_ATTRIBUTES))?
                 .queue(SetForegroundColor(Color::Cyan))?;
             stdout.write_all(b"Hint")?;
             stdout.queue(ResetColor)?;
@@ -175,16 +242,17 @@ 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,
-            line_width,
+            self.term_width,
         )?;
 
         stdout.write_all(b"\nCurrent exercise: ")?;
-        terminal_file_link(stdout, self.app_state.current_exercise().path, Color::Blue)?;
+        self.app_state
+            .current_exercise()
+            .terminal_file_link(stdout)?;
         stdout.write_all(b"\n\n")?;
 
         self.show_prompt(stdout)?;
@@ -193,7 +261,39 @@ impl<'a> WatchState<'a> {
     }
 
     pub fn show_hint(&mut self, stdout: &mut StdoutLock) -> io::Result<()> {
-        self.show_hint = true;
-        self.render(stdout)
+        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(())
     }
 }

src/watch/terminal_event.rs

@@ -1,86 +1,73 @@
-use crossterm::event::{self, Event, KeyCode, KeyEventKind, KeyModifiers};
-use std::sync::mpsc::Sender;
+use crossterm::event::{self, Event, KeyCode, KeyEventKind};
+use std::sync::{
+    atomic::Ordering::Relaxed,
+    mpsc::{Receiver, Sender},
+};
 
-use super::WatchEvent;
+use super::{EXERCISE_RUNNING, WatchEvent};
 
 pub enum InputEvent {
-    Run,
     Next,
+    Run,
     Hint,
     List,
+    CheckAll,
+    Reset,
     Quit,
-    Unrecognized,
 }
 
-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) => {
+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)) => {
                 match key.kind {
                     KeyEventKind::Release | KeyEventKind::Repeat => continue,
                     KeyEventKind::Press => (),
                 }
 
-                if key.modifiers != KeyModifiers::NONE {
-                    last_input_valid = false;
+                if EXERCISE_RUNNING.load(Relaxed) {
                     continue;
                 }
 
                 let input_event = match key.code {
-                    KeyCode::Enter => {
-                        if last_input_valid {
-                            continue;
+                    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;
                         }
 
-                        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;
-                            }
+                        // Pause input until quitting the confirmation prompt.
+                        if unpause_receiver.recv().is_err() {
+                            return;
                         };
 
-                        last_input_valid = true;
-                        input_event
-                    }
-                    _ => {
-                        last_input_valid = false;
                         continue;
                     }
+                    KeyCode::Char('q') => break WatchEvent::Input(InputEvent::Quit),
+                    _ => continue,
                 };
 
-                if tx.send(WatchEvent::Input(input_event)).is_err() {
+                if sender.send(WatchEvent::Input(input_event)).is_err() {
                     return;
                 }
             }
-            Event::Resize(_, _) => {
-                if tx.send(WatchEvent::TerminalResize).is_err() {
+            Ok(Event::Resize(width, _)) => {
+                if sender.send(WatchEvent::TerminalResize { width }).is_err() {
                     return;
                 }
             }
-            Event::FocusGained | Event::FocusLost | Event::Mouse(_) => continue,
+            Ok(Event::FocusGained | Event::FocusLost | Event::Mouse(_)) => continue,
+            Err(e) => break WatchEvent::TerminalEventErr(e),
         }
     };
 
-    let _ = tx.send(WatchEvent::Input(last_input_event));
+    let _ = sender.send(last_watch_event);
 }

tests/test_exercises/dev/Cargo.toml

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