Merge 485f8fb7a5 into 7d45ea43f5

.github/workflows/tests.yml

@@ -173,9 +173,12 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
+      - name: Read MSRV from Cargo.toml
+        id: metadata
+        run: echo "rust-version=$(sed -ne 's/rust-version *= *\"\(.*\)\"/\1/p' Cargo.toml)" >> $GITHUB_OUTPUT
       - uses: ./.github/actions/setup-rust
         with:
-          version: 1.70.0
+          version: ${{ steps.metadata.outputs.rust-version }}
       - run: rustup toolchain install nightly
       - run: rm Cargo.lock && cargo +nightly update -Z direct-minimal-versions && cargo update -p bumpalo@3.15.3 --precise 3.14.0
       - run: cargo test
@@ -310,9 +313,12 @@ jobs:
       - uses: actions/checkout@v3
         with:
           submodules: true
+      - name: Read MSRV from Cargo.toml
+        id: metadata
+        run: echo "rust-version=$(sed -ne 's/rust-version *= *\"\(.*\)\"/\1/p' Cargo.toml)" >> $GITHUB_OUTPUT
       - uses: ./.github/actions/setup-rust
         with:
-          version: 1.70.0
+          version: ${{ steps.metadata.outputs.rust-version }}
       - run: rustup toolchain install nightly
       - uses: actions/setup-python@v4
         with:

lints/build_clippy_config.py

@@ -4,7 +4,6 @@ from urllib.request import urlopen
 
 import tomlkit
 
-MSRV = "1.74.0"
 LINT_BLACKLIST = {
     "absolute_paths",  # TODO: might be nice
     "alloc_instead_of_core",
@@ -63,6 +62,11 @@ LINT_BLACKLIST = {
     "wildcard_imports",  # TODO: might be nice
 }
 
+cargo_path = Path(__file__).parent.parent / "Cargo.toml"
+cargo_toml = tomlkit.parse(cargo_path.read_text())
+MSRV = cargo_toml["workspace"]["package"]["rust-version"]
+print(f"MSRV from the root Cargo.toml: {MSRV}")
+
 lints = set()
 with urlopen(
     f"https://rust-lang.github.io/rust-clippy/rust-{MSRV}/lints.json"
@@ -77,7 +81,5 @@ for flag in LINT_BLACKLIST:
     else:
         print(f"Unused blacklisted flag: {flag}")
 
-cargo_path = Path(__file__).parent.parent / "Cargo.toml"
-cargo_toml = tomlkit.parse(cargo_path.read_text())
 cargo_toml["workspace"]["lints"]["clippy"] = {lint: "warn" for lint in sorted(lints)}
 cargo_path.write_text(tomlkit.dumps(cargo_toml))