Merge pull request #2011 from rust-lang/ci

Update CI

.github/workflows/rust.yml

@@ -18,25 +18,26 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: DavidAnson/markdownlint-cli2-action@v16
-        with:
-          components: rustfmt
-      - uses: DavidAnson/markdownlint-cli2-action@v9
         with:
           globs: "exercises/**/*.md"
       - name: Run cargo fmt
-        run: |
+        run: cargo fmt --all -- --check
-          cargo fmt --all -- --check
   test:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
       - uses: swatinem/rust-cache@v2
       - name: Run cargo test
-        run: |
+        run: cargo test
-          cargo test
+  dev-check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: swatinem/rust-cache@v2
+      - name: Run rustlings dev check
+        run: cargo run -- dev check

.github/workflows/web.yml

@@ -54,10 +54,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Setup
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: dtolnay/rust-toolchain@stable
       - uses: swatinem/rust-cache@v2
 
       # If you use any mdbook plugins, here's the place to install them!

solutions/12_options/options1.rs

@@ -4,8 +4,8 @@
 // `hour_of_day` is higher than 23.
 fn maybe_icecream(hour_of_day: u16) -> Option<u16> {
     match hour_of_day {
-        0..22 => Some(5),
+        0..=21 => Some(5),
-        22..24 => Some(0),
+        22..=23 => Some(0),
         _ => None,
     }
 }