Skip to content

Commit

Permalink
Merge pull request #329 from dtolnay/up
Browse files Browse the repository at this point in the history
Raise required compiler to rust 1.61
  • Loading branch information
dtolnay authored Oct 31, 2024
2 parents bb30f2e + 51a5e4c commit a9a6c98
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
rust: [nightly, beta, stable, 1.56.0]
rust: [nightly, beta, stable, 1.70.0, 1.61.0]
timeout-minutes: 45
steps:
- uses: actions/checkout@v4
Expand All @@ -39,6 +39,7 @@ jobs:
run: echo RUSTFLAGS=${RUSTFLAGS}\ --cfg=thiserror_nightly_testing >> $GITHUB_ENV
if: matrix.rust == 'nightly'
- run: cargo test --all
if: matrix.rust != '1.61.0'
- uses: actions/upload-artifact@v4
if: matrix.rust == 'nightly' && always()
with:
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = "2021"
keywords = ["error", "error-handling", "derive"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/dtolnay/thiserror"
rust-version = "1.56"
rust-version = "1.61"

[dependencies]
thiserror-impl = { version = "=1.0.65", path = "impl" }
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This library provides a convenient derive macro for the standard library's
thiserror = "1.0"
```

*Compiler support: requires rustc 1.56+*
*Compiler support: requires rustc 1.61+*

<br>

Expand Down
5 changes: 1 addition & 4 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,7 @@ fn compile_probe(rustc_bootstrap: bool) -> bool {

fn cargo_env_var(key: &str) -> OsString {
env::var_os(key).unwrap_or_else(|| {
eprintln!(
"Environment variable ${} is not set during execution of build script",
key,
);
eprintln!("Environment variable ${key} is not set during execution of build script");
process::exit(1);
})
}
2 changes: 1 addition & 1 deletion impl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ description = "Implementation detail of the `thiserror` crate"
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/dtolnay/thiserror"
rust-version = "1.56"
rust-version = "1.61"

[lib]
proc-macro = true
Expand Down

0 comments on commit a9a6c98

Please sign in to comment.