Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump MSRV to Rust 1.48.0 #84

Merged
merged 1 commit into from
Jun 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ jobs:
rust:
- version: 1.66.1 # STABLE
features: use-miniscript
- version: 1.41.1 # MSRV
features: use-miniscript,msrv1411
- version: 1.48.0 # MSRV
features: use-miniscript
emulator:
- name: trezor
- name: ledger
Expand Down Expand Up @@ -84,6 +84,11 @@ jobs:
run: rustup set profile minimal
- name: Update toolchain
run: rustup update
- if: ${{matrix.rust.version}} = 1.48.0
name: Pin dependencies that use edition 2021
# serde 1.0.157 uses syn 2.0 which requires edition 2021.
# once_cell v0.15.0 uses edition 2021.
run: cargo update -p serde --precise 1.0.156 && cargo update -p once_cell --precise 1.14.0
- name: Test
run: cargo test --features ${{ matrix.rust.features }}
- name: Wipe
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Every new feature should be covered by unit tests where possible.
When refactoring, structure your PR to make it easy to review and don't
hesitate to split it into multiple small, focused PRs.

The Minimal Supported Rust Version is 1.41.1 (enforced by our CI).
The Minimal Supported Rust Version is 1.48.0 (enforced by our CI).

Commits should cover both the issue fixed and the solution's rationale.
These [guidelines](https://chris.beams.io/posts/git-commit/) should be kept in mind.
Expand Down
2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@ serde = { version = "^1.0", features = ["derive"] }
serde_json = { version = "^1.0" }
pyo3 = { version = "0.15.1", features = ["auto-initialize"] }
base64 = "0.13.0"
once_cell = { version = "=1.14", optional = true }

[dev-dependencies]
serial_test = "0.6.0"

[features]
doctest = []
use-miniscript = ["miniscript"]
msrv1411 = ["once_cell"]
7 changes: 1 addition & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,7 @@ This library internally uses PyO3 to call HWI's functions. It is not a re-implem

## MSRV

The MSRV for this project is `1.41.1` but to support this version you must enable the `msrv1411` feature:
```cargo
[dependencies]
hwi = { path = "../rust-hwi", features = ["msrv1411"] }
```
If the `msrv1411` feature is not enabled you must use at least rust version `1.56.0`.
The MSRV for this project is `1.48.0`.

## Prerequisites

Expand Down
2 changes: 1 addition & 1 deletion clippy.toml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
msrv="1.41.1"
msrv="1.48.0"