Skip to content

Commit

Permalink
Require Rust 1.80+ going forward. (#983)
Browse files Browse the repository at this point in the history
* Require Rust 1.80+ going forward.

* Update caching across rustdoc versions test.

* Fix expected error message string.
  • Loading branch information
obi1kenobi authored Oct 18, 2024
1 parent cc74071 commit de36e95
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down

0 comments on commit de36e95

Please sign in to comment.