From 71fa9e81e70c9edea9dd1c1106acb221340bbe61 Mon Sep 17 00:00:00 2001 From: "Tobin C. Harding" Date: Wed, 22 Mar 2023 13:52:20 +1100 Subject: [PATCH] Bump MSRV to 1.48.1 As per discussion [0] bump our MSRV for all crates in `rust-bitcoin` repo to 1.48.1 [1]. [0] https://github.com/rust-bitcoin/rust-bitcoin/discussions/1329 [1] https://blog.rust-lang.org/2020/11/19/Rust-1.48.html --- .github/workflows/rust.yml | 18 ++---------------- README.md | 7 +++---- bitcoin/contrib/test.sh | 8 +------- hashes/README.md | 2 +- 4 files changed, 7 insertions(+), 28 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 2316122e..4b1fc15c 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -66,7 +66,7 @@ jobs: run: ./contrib/test.sh MSRV: - name: Test - 1.41.1 toolchain + name: Test - 1.48.0 toolchain runs-on: ubuntu-latest strategy: fail-fast: false @@ -74,24 +74,10 @@ jobs: - name: Checkout Crate uses: actions/checkout@v3 - name: Checkout Toolchain - uses: dtolnay/rust-toolchain@1.41.1 + uses: dtolnay/rust-toolchain@1.48.0 - name: Running test script env: DO_FEATURE_MATRIX: true - run: ./contrib/test.sh - - NoStd: - name: Test - 1.47 toolchain - runs-on: ubuntu-latest - strategy: - fail-fast: false - steps: - - name: Checkout Crate - uses: actions/checkout@v3 - - name: Checkout Toolchain - uses: dtolnay/rust-toolchain@1.47 - - name: Running test script - env: DO_NO_STD: true run: ./contrib/test.sh diff --git a/README.md b/README.md index 2469bd41..7ed79a5e 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ CC0 1.0 Universal Licensed CI Status API Docs - Rustc Version 1.41.1+ + Rustc Version 1.48.0+ Chat on IRC Lines of code @@ -76,10 +76,9 @@ For more information please see `./CONTRIBUTING.md`. ## Minimum Supported Rust Version (MSRV) -This library should always compile with any combination of features (minus -`no-std`) on **Rust 1.41.1** or **Rust 1.47** with `no-std`. +This library should always compile with any combination of features on **Rust 1.48.0**. -To build with the MSRV you will need to pin some dependencies (also for `no-std`): +To build with the MSRV you will need to pin some dependencies: ``` cargo update -p serde --precise 1.0.156 cargo update -p syn --precise 1.0.107 diff --git a/bitcoin/contrib/test.sh b/bitcoin/contrib/test.sh index c3b8e914..b5dacb67 100755 --- a/bitcoin/contrib/test.sh +++ b/bitcoin/contrib/test.sh @@ -24,19 +24,13 @@ if cargo --version | grep beta; then fi # Pin dependencies as required if we are using MSRV toolchain. -if cargo --version | grep "1\.41"; then +if cargo --version | grep "1\.48"; then # 1.0.157 uses syn 2.0 which requires edition 2018 cargo update -p serde --precise 1.0.156 # 1.0.108 uses `matches!` macro so does not work with Rust 1.41.1, bad `syn` no biscuit. cargo update -p syn --precise 1.0.107 fi -# Pin dependencies as above (required for no-std tests that use Rust 1.47 toolchain). -if cargo --version | grep "1\.47"; then - cargo update -p serde --precise 1.0.156 - cargo update -p syn --precise 1.0.107 -fi - # We should not have any duplicate dependencies. This catches mistakes made upgrading dependencies # in one crate and not in another (e.g. upgrade bitcoin_hashes in bitcoin but not in secp). duplicate_dependencies=$( diff --git a/hashes/README.md b/hashes/README.md index 96a04080..9cd6f8fd 100644 --- a/hashes/README.md +++ b/hashes/README.md @@ -11,7 +11,7 @@ since these are needed to display hashes anway. ## Minimum Supported Rust Version (MSRV) -This library should always compile with any combination of features on **Rust 1.41.1**. +This library should always compile with any combination of features on **Rust 1.48.0**. ## Contributions