Skip to content

Commit b238366

Browse files
committed
Update MSRV to 1.48
1 parent aa1769c commit b238366

File tree

7 files changed

+13
-19
lines changed

7 files changed

+13
-19
lines changed

.github/workflows/fuzz.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ compile_descriptor,
3939
key: cache-${{ matrix.target }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
4040
- uses: actions-rs/toolchain@v1
4141
with:
42-
toolchain: 1.58
42+
toolchain: 1.64
4343
override: true
4444
profile: minimal
4545
- name: fuzz

.github/workflows/rust.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ jobs:
5454
- rust: stable
5555
- rust: beta
5656
- rust: nightly
57-
- rust: 1.41.1
58-
- rust: 1.47
57+
- rust: 1.48
5958
steps:
6059
- name: Checkout Crate
6160
uses: actions/checkout@v2

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
![Build](https://github.com/rust-bitcoin/rust-miniscript/workflows/Continuous%20integration/badge.svg)
22

3-
**Minimum Supported Rust Version:** 1.41.1
3+
**Minimum Supported Rust Version:** 1.48.0
44

55
# Miniscript
66

@@ -40,8 +40,7 @@ The cargo feature `std` is enabled by default. At least one of the features `std
4040
Enabling the `no-std` feature does not disable `std`. To disable the `std` feature you must disable default features. The `no-std` feature only enables additional features required for this crate to be usable without `std`. Both can be enabled without conflict.
4141

4242
## Minimum Supported Rust Version (MSRV)
43-
This library should always compile with any combination of features (minus
44-
`no-std`) on **Rust 1.41.1** or **Rust 1.47** with `no-std`.
43+
This library should always compile with any combination of features on **Rust 1.48.0**.
4544

4645
Some dependencies do not play nicely with our MSRV, if you are running the tests
4746
you may need to pin some dependencies. See `./contrib/test.sh` for current pinning.

bitcoind-tests/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ publish = false
99

1010
[dependencies]
1111
miniscript = {path = "../"}
12-
bitcoind = { version = "0.30.0" }
12+
bitcoind = { version = "0.32.0" }
1313
actual-rand = { package = "rand", version = "0.8.4"}
1414
secp256k1 = {version = "0.27.0", features = ["rand-std"]}
1515
internals = { package = "bitcoin-private", version = "0.1.0", default_features = false }

clippy.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
msrv = "1.41.1"
1+
msrv = "1.48.0"

contrib/test.sh

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,14 @@ then
1414
cargo fmt -- --check
1515
fi
1616

17-
# Pin dependencies required to build with Rust 1.41.1
18-
if cargo --version | grep "1\.41\.0"; then
17+
# Pin dependencies required to build with Rust 1.48.0
18+
if cargo --version | grep "1\.48\.0"; then
1919
cargo update -p once_cell --precise 1.13.1
20+
cargo update -p quote --precise 1.0.28
21+
cargo update -p proc-macro2 --precise 1.0.63
2022
cargo update -p serde_json --precise 1.0.99
21-
cargo update -p serde --precise 1.0.156
22-
fi
23-
24-
# Pin dependencies required to build with Rust 1.47.0
25-
if cargo --version | grep "1\.47\.0"; then
26-
cargo update -p once_cell --precise 1.13.1
27-
cargo update -p serde_json --precise 1.0.99
28-
cargo update -p serde --precise 1.0.156
23+
cargo update -p serde --precise 1.0.152
24+
cargo update -p log --precise 0.4.18
2925
fi
3026

3127
# Test bitcoind integration tests if told to (this only works with the stable toolchain)

fuzz/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cargo-fuzz = true
1212
honggfuzz = { version = "0.5.55", default-features = false }
1313
miniscript = { path = "..", features = [ "compiler" ] }
1414

15-
regex = "1.4"
15+
regex = "1.0"
1616

1717
[[bin]]
1818
name = "roundtrip_miniscript_str"

0 commit comments

Comments
 (0)