Skip to content

Commit

Permalink
Merge #334: Bump MSRV to Rust 1.56.1
Browse files Browse the repository at this point in the history
e7a438b Bump MSRV to Rust 1.56.1 (Tobin C. Harding)

Pull request description:

  As we have done for the rest of the ecosystem; bump the MSRV to Rust `v1.56.1` - enables edition 2021.

ACKs for top commit:
  apoelstra:
    ACK e7a438b

Tree-SHA512: 9988ec3449aa3792f867326e5e50b492bb55a7eddabbaaaa86e280891815cd4e8d60c6c95d1118bf69256b71d027f6306abfadbc650ba68de7ec173ba61a503d
  • Loading branch information
apoelstra committed Apr 25, 2024
2 parents d44ab83 + e7a438b commit 4b3ac19
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- rust: nightly
env:
RUSTFMTCHK: false
- rust: 1.48.0
- rust: 1.56.1
env:
RUSTFMTCHK: false
steps:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Unreleased

- MSRV changed from 1.48.0 to 1.56.1

# 0.18.0

- MSRV changed from 1.41.1 to 1.48.0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ The following versions are officially supported and automatically tested:
* 0.21.0

# Minimum Supported Rust Version (MSRV)
This library should always compile with any combination of features on **Rust 1.48.0**.
This library should always compile with any combination of features on **Rust 1.56.1**.
8 changes: 2 additions & 6 deletions contrib/test.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

set -xe

MSRV="1\.48"
MSRV="1\.56"

# Just echo all the relevant env vars to help debug Travis.
echo "RUSTFMTCHECK: \"$RUSTFMTCHECK\""
Expand All @@ -13,14 +13,10 @@ if [ -n "$RUSTFMTCHECK" ]; then
cargo fmt --all -- --check
fi

# Test pinned versions (these are from rust-bitcoin pinning for 1.48).
# Test pinned versions.
if cargo --version | grep ${MSRV}; then
cargo update -p tempfile --precise 3.3.0
cargo update -p log --precise 0.4.18
cargo update -p serde_json --precise 1.0.99
cargo update -p serde --precise 1.0.156
cargo update -p quote --precise 1.0.30
cargo update -p proc-macro2 --precise 1.0.63
fi

# Integration test.
Expand Down
3 changes: 2 additions & 1 deletion json/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ repository = "https://github.com/rust-bitcoin/rust-bitcoincore-rpc/"
description = "JSON-enabled type structs for bitcoincore-rpc crate."
keywords = [ "crypto", "bitcoin", "bitcoin-core", "rpc" ]
readme = "README.md"
edition = "2018"
edition = "2021"
rust-version = "1.56.1"

[lib]
name = "bitcoincore_rpc_json"
Expand Down

0 comments on commit 4b3ac19

Please sign in to comment.