Skip to content

Commit a761f33

Browse files
committed
Merge branch 'increase_msrv'
2 parents 55cd231 + f4596d7 commit a761f33

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
strategy:
5959
fail-fast: false
6060
matrix:
61-
toolchain: ["1.41.1", "stable", "nightly"]
61+
toolchain: ["1.48.0", "stable", "nightly"]
6262

6363
steps:
6464
- uses: actions/checkout@v3
@@ -68,8 +68,7 @@ jobs:
6868
- uses: dtolnay/rust-toolchain@master
6969
with:
7070
toolchain: ${{ matrix.toolchain }}
71-
- run: cargo update -p which --precise 4.3.0
72-
- run: cargo update -p tempfile --precise 3.3.0
71+
- run: cargo update -p log --precise 0.4.18
7372
- run: cargo update -p serde --precise 1.0.152
7473
- run: cargo build
7574

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description = "Utility to run a regtest bitcoind process, useful in integration
66
license = "MIT"
77
repository = "https://github.com/RCasatta/bitcoind"
88
documentation = "https://docs.rs/bitcoind/"
9-
rust-version = "1.41.1" # without features, with any feature is 1.57
9+
rust-version = "1.48.0" # without features, with any feature is 1.57
1010
edition = "2018"
1111
categories = ["cryptography::cryptocurrencies", "development-tools::testing"]
1212

README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,25 +73,26 @@ RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --features download,doc --open
7373

7474
## MSRV
7575

76-
The MSRV is 1.41.1 for version 0.29.* if no feature is used, otherwise is 1.57
76+
The MSRV is 1.48.0 for version 0.29.* if no feature is used, otherwise is 1.57
7777

78-
Note: to respect 1.41.1 MSRV you need to use and older version of the which and tempfile dependencies,
78+
Note: to respect 1.48.0 MSRV you need to use and older version of the which and tempfile dependencies,
7979
like it's done in the CI:
8080

8181
```sh
82-
cargo update -p which --precise 4.3.0
8382
cargo update -p serde --precise 1.0.152
84-
cargo update -p tempfile --precise 3.3.0
83+
cargo update -p log --precise 0.4.18
8584
```
8685

8786
Pinning in `Cargo.toml` is avoided because it could cause
8887
compilation issues downstream.
8988

9089
## Nix
9190

92-
For reproducibility reasons, Nix build scripts cannot hit the internet, but the auto-download
93-
feature does exactly that. To successfully build under Nix the user must provide the tarball locally
94-
and specify its location via the `BITCOIND_TARBALL_FILE` env var.
91+
For reproducibility reasons, Nix build scripts cannot hit the internet, but the
92+
auto-download feature does exactly that. To successfully build under Nix the
93+
user must provide the tarball locally and specify its location via the
94+
`BITCOIND_TARBALL_FILE` env var.
95+
Alternativily, use the dep without auto-download feature.
9596

9697
## Used by
9798

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"

0 commit comments

Comments
 (0)