From f36746096e7212813b97876f5d10731f6bb8bb74 Mon Sep 17 00:00:00 2001
From: Predrag Gruevski <obi1kenobi82@gmail.com>
Date: Tue, 7 Nov 2023 23:36:32 +0000
Subject: [PATCH] Require minimum Rust 1.71 to work.

---
 .github/workflows/ci.yml | 26 ++++++--------------------
 src/config.rs            |  2 +-
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1f7f7f26..005db1fb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -144,13 +144,13 @@ jobs:
   rust-tests:
     name: Run tests
     runs-on: ubuntu-latest
-    continue-on-error: true  # TODO: revert this change before merging!!
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
         # IMPORTANT: When updating the versions here, make sure you also update
         #            the `fails-on-too-old-rustc` job and its error message to
         #            to account for the raised minimum required version.
-        toolchain: ["1.70", "1.71", "1.72", "stable", "beta"]
+        toolchain: ["1.71", "1.72", "stable", "beta"]
         experimental: [false]
         include:
           - toolchain: "nightly"
@@ -330,7 +330,7 @@ jobs:
         id: toolchain
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: "1.70"  # Rust 1.70 uses rustdoc v24
+          toolchain: "1.73"  # Rust 1.73 uses rustdoc v26
           rustflags: ""
           cache: false
 
@@ -364,7 +364,7 @@ jobs:
       - name: Install newer rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: "1.72"  # Rust 1.72 uses rustdoc v26
+          toolchain: "beta"  # Rust 1.74-beta uses rustdoc v27
           rustflags: ""
           cache: false
 
@@ -432,7 +432,6 @@ jobs:
         with:
           cache: false
           rustflags: ""
-          toolchain: nightly
 
       - name: Restore rustdoc
         id: cache
@@ -526,7 +525,6 @@ jobs:
         with:
           cache: false
           rustflags: ""
-          toolchain: nightly
 
       # rust-libp2p requires protobuf-compiler.
       - name: Install protobuf-compiler
@@ -606,7 +604,6 @@ jobs:
         with:
           cache: false
           rustflags: ""
-          toolchain: nightly
 
       # rust-libp2p requires protobuf-compiler.
       - name: Install protobuf-compiler
@@ -681,7 +678,6 @@ jobs:
         with:
           cache: false
           rustflags: ""
-          toolchain: nightly
 
       # rust-libp2p requires protobuf-compiler.
       - name: Install protobuf-compiler
@@ -754,7 +750,6 @@ jobs:
         with:
           cache: false
           rustflags: ""
-          toolchain: nightly
 
       # rust-libp2p requires protobuf-compiler.
       - name: Install protobuf-compiler
@@ -823,7 +818,6 @@ jobs:
         with:
           cache: false
           rustflags: ""
-          toolchain: nightly
 
       # This job runs on macOS, not Linux like the rest.
       # It should save its cache, because no other job will save it in its place.
@@ -882,7 +876,6 @@ jobs:
         with:
           cache: false
           rustflags: ""
-          toolchain: nightly
 
       - name: Restore binary
         id: cache-binary
@@ -946,7 +939,6 @@ jobs:
         with:
           cache: false
           rustflags: ""
-          toolchain: nightly
 
       - name: Restore binary
         id: cache-binary
@@ -1009,7 +1001,6 @@ jobs:
         with:
           cache: false
           rustflags: ""
-          toolchain: nightly
 
       - name: Restore binary
         id: cache-binary
@@ -1077,7 +1068,6 @@ jobs:
         with:
           cache: false
           rustflags: ""
-          toolchain: nightly
 
       - name: Restore cargo index and rustdoc target dir
         uses: Swatinem/rust-cache@v2
@@ -1156,7 +1146,6 @@ jobs:
         with:
           cache: false
           rustflags: ""
-          toolchain: nightly
 
       - name: Restore cargo index and rustdoc target dir
         uses: Swatinem/rust-cache@v2
@@ -1234,7 +1223,6 @@ jobs:
         with:
           cache: false
           rustflags: ""
-          toolchain: nightly
 
       - name: Restore binary
         id: cache-binary
@@ -1458,7 +1446,6 @@ jobs:
         with:
           cache: false
           rustflags: ""
-          toolchain: nightly
 
       - name: Restore binary
         id: cache-binary
@@ -1556,7 +1543,6 @@ jobs:
         with:
           cache: false
           rustflags: ""
-          toolchain: nightly
 
       - name: Restore binary
         id: cache-binary
@@ -1620,7 +1606,7 @@ jobs:
         id: toolchain
         uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: "1.67"
+          toolchain: "1.70"
           rustflags: ""
           cache: false
 
@@ -1663,7 +1649,7 @@ jobs:
       - name: Check output
         run: |
           cd semver
-          EXPECTED="$(echo -e "Error: rustc version is not high enough: >=1.68.0 needed, got 1.67.1")"
+          EXPECTED="$(echo -e "Error: rustc version is not high enough: >=1.71.0 needed, got 1.70.0")"
           RESULT="$(cat output | grep Error)"
           diff <(echo "$RESULT") <(echo "$EXPECTED")
 
diff --git a/src/config.rs b/src/config.rs
index de2c3b9f..93b5c55f 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -52,7 +52,7 @@ impl GlobalConfig {
                 }
             })),
             handlebars: make_handlebars_registry(),
-            minimum_rustc_version: semver::Version::new(1, 68, 0),
+            minimum_rustc_version: semver::Version::new(1, 71, 0),
         }
     }