Skip to content

Commit b4f4576

Browse files
committed
Merge #312: Bump MSRV to 1.48
7053c8f Update MSRV to Rust 1.48.0 (Tobin C. Harding) Pull request description: This would allow us to upgrade the `jsonrpc` dep and get `minreq` support possibly alleviating the need for #276. Also required to use the latest `rust-bitcoin`. ACKs for top commit: RCasatta: utACK 7053c8f Tree-SHA512: f3e25dfc2e61cab4666ab0be47406282fbdaabe614d98715377a16ff472d89f5678fb1a29613ca43cf9b671194b21af2b69c15d52ccd7dc26c0b8ac573b898a5
2 parents 7bd815f + 7053c8f commit b4f4576

File tree

4 files changed

+17
-3
lines changed

4 files changed

+17
-3
lines changed

Diff for: .github/workflows/rust.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- rust: nightly
1616
env:
1717
RUSTFMTCHK: false
18-
- rust: 1.41.1
18+
- rust: 1.48.0
1919
env:
2020
RUSTFMTCHK: false
2121
steps:
@@ -27,7 +27,6 @@ jobs:
2727
profile: minimal
2828
toolchain: ${{ matrix.rust }}
2929
override: true
30-
- run: cargo update -p serde --precise 1.0.152
3130
- name: Running test script
3231
env: ${{ matrix.env }}
3332
run: ./contrib/test.sh

Diff for: CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Unreleased
2+
3+
- MSRV changed from 1.41.1 to 1.48.0
4+
15
# 0.17.0
26

37
- add `list_wallet_dir` rpc

Diff for: README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ The following versions are officially supported and automatically tested:
4747
* 0.21.0
4848

4949
# Minimum Supported Rust Version (MSRV)
50-
This library should always compile with any combination of features on **Rust 1.41.1**.
50+
This library should always compile with any combination of features on **Rust 1.48.0**.

Diff for: contrib/test.sh

+11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11

22
set -xe
33

4+
MSRV="1\.48"
5+
46
# Just echo all the relevant env vars to help debug Travis.
57
echo "RUSTFMTCHECK: \"$RUSTFMTCHECK\""
68
echo "BITCOINVERSION: \"$BITCOINVERSION\""
@@ -11,6 +13,15 @@ if [ -n "$RUSTFMTCHECK" ]; then
1113
cargo fmt --all -- --check
1214
fi
1315

16+
# Test pinned versions (these are from rust-bitcoin pinning for 1.48).
17+
if cargo --version | grep ${MSRV}; then
18+
cargo update -p log --precise 0.4.18
19+
cargo update -p serde_json --precise 1.0.99
20+
cargo update -p serde --precise 1.0.156
21+
cargo update -p quote --precise 1.0.30
22+
cargo update -p proc-macro2 --precise 1.0.63
23+
fi
24+
1425
# Integration test.
1526
if [ -n "$BITCOINVERSION" ]; then
1627
wget https://bitcoincore.org/bin/bitcoin-core-$BITCOINVERSION/bitcoin-$BITCOINVERSION-x86_64-linux-gnu.tar.gz

0 commit comments

Comments
 (0)