From de36e95234340234421702d8798e33923b4d652c Mon Sep 17 00:00:00 2001 From: Predrag Gruevski <2348618+obi1kenobi@users.noreply.github.com> Date: Fri, 18 Oct 2024 16:10:51 -0400 Subject: [PATCH] Require Rust 1.80+ going forward. (#983) * Require Rust 1.80+ going forward. * Update caching across rustdoc versions test. * Fix expected error message string. --- .github/workflows/ci.yml | 10 +++++----- Cargo.toml | 4 ++-- src/config.rs | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3bae760c..b7e5b57b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -169,7 +169,7 @@ jobs: # # Also make sure to update the MSRV in the cargo-semver-checks-action CI: # https://github.com/obi1kenobi/cargo-semver-checks-action/blob/main/.github/workflows/test-action.yml#L18 - toolchain: ["1.77", "1.78", "1.79", "1.80", "1.81", "stable", "beta"] + toolchain: ["1.80", "1.81", "stable", "beta"] experimental: [false] include: - toolchain: "nightly" @@ -319,8 +319,8 @@ jobs: needs: - build-binary env: - OLDER_RUST: "1.77" # Rust 1.77 uses rustdoc v28 - NEWER_RUST: "1.80" # Rust 1.80 uses rustdoc v30 + OLDER_RUST: "1.81" # Rust 1.81 uses rustdoc v32 + NEWER_RUST: "1.82" # Rust 1.82 uses rustdoc v33 steps: - name: Put env vars in outputs id: vars @@ -1742,7 +1742,7 @@ jobs: id: toolchain uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: "1.76" + toolchain: "1.79" rustflags: "" cache: false @@ -1785,7 +1785,7 @@ jobs: - name: Check output run: | cd semver - EXPECTED="$(echo -e "error: rustc version is not high enough: >=1.77.0 needed, got 1.76.0")" + EXPECTED="$(echo -e "error: rustc version is not high enough: >=1.80.0 needed, got 1.79.0")" RESULT="$(cat output | grep 'error: rustc version')" diff <(echo "$RESULT") <(echo "$EXPECTED") diff --git a/Cargo.toml b/Cargo.toml index 9cc144cc..44c1bf1f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,14 +9,14 @@ repository = "https://github.com/obi1kenobi/cargo-semver-checks" readme = "./README.md" keywords = ["semver", "linter", "check", "crate", "cargo"] categories = ["command-line-utilities", "development-tools::cargo-plugins"] -rust-version = "1.77" +rust-version = "1.80" exclude = [".github/", "brand/", "scripts/", "test_crates/", "test_outputs/", "tests/"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] trustfall = "0.7.1" -trustfall_rustdoc = { version = "0.16.4", default-features = false, features = ["v28", "v29", "v30", "v32", "v33", "v34", "v35", "v36", "rayon", "rustc-hash"] } +trustfall_rustdoc = { version = "0.16.4", default-features = false, features = ["v30", "v32", "v33", "v34", "v35", "v36", "rayon", "rustc-hash"] } clap = { version = "4.5.17", features = ["derive", "cargo"] } serde_json = "1.0.128" anyhow = "1.0.89" diff --git a/src/config.rs b/src/config.rs index 4dd0a3d2..be99b071 100644 --- a/src/config.rs +++ b/src/config.rs @@ -37,7 +37,7 @@ impl GlobalConfig { Self { level: None, handlebars: make_handlebars_registry(), - minimum_rustc_version: semver::Version::new(1, 77, 0), + minimum_rustc_version: semver::Version::new(1, 80, 0), stdout: AutoStream::new(Box::new(std::io::stdout()), stdout_choice), stderr: AutoStream::new(Box::new(std::io::stderr()), stderr_choice), feature_flags: HashSet::new(),