diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 58faef4..af452bc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 @@ -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 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 251d183..505d5b9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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. diff --git a/Cargo.toml b/Cargo.toml index 5b09d13..df87580 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,6 @@ 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" @@ -25,4 +24,3 @@ serial_test = "0.6.0" [features] doctest = [] use-miniscript = ["miniscript"] -msrv1411 = ["once_cell"] diff --git a/README.md b/README.md index 4a28deb..10a1ca2 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/clippy.toml b/clippy.toml index 05e46b3..516ad1f 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1 +1 @@ -msrv="1.41.1" +msrv="1.48.0"