From da48b10f2eb135095f9f8f25ed2dc083428b805f Mon Sep 17 00:00:00 2001 From: Riccardo Casatta Date: Tue, 2 Apr 2024 11:17:54 +0200 Subject: [PATCH] increase MSRV to 1.56.1 --- .github/workflows/test.yml | 10 ++-------- Cargo.toml | 4 ++-- README.md | 12 ++---------- clippy.toml | 2 +- src/lib.rs | 4 ++-- 5 files changed, 9 insertions(+), 23 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e4f685c..a80d75c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -69,7 +69,7 @@ jobs: strategy: fail-fast: false matrix: - toolchain: ["1.48.0", "stable", "nightly"] + toolchain: ["1.56.1", "stable", "nightly"] steps: - uses: actions/checkout@v3 @@ -81,15 +81,9 @@ jobs: toolchain: ${{ matrix.toolchain }} - run: | cargo update - cargo update -p which --precise 4.2.5 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 regex --precise 1.7.3 - cargo update -p quote --precise 1.0.28 - cargo update -p proc-macro2 --precise 1.0.63 - if: ${{ matrix.toolchain == '1.48.0' }} + if: ${{ matrix.toolchain == '1.56.1' }} - run: cargo build build-nix: diff --git a/Cargo.toml b/Cargo.toml index 332db3f..3208f6f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "bitcoind" -version = "0.34.2" +version = "0.35.0" authors = ["Riccardo Casatta "] description = "Utility to run a regtest bitcoind process, useful in integration testing environment" license = "MIT" repository = "https://github.com/RCasatta/bitcoind" documentation = "https://docs.rs/bitcoind/" -rust-version = "1.48.0" # without features, with any feature is 1.57 +rust-version = "1.56.1" edition = "2018" categories = ["cryptography::cryptocurrencies", "development-tools::testing"] diff --git a/README.md b/README.md index e010e0e..df40e62 100644 --- a/README.md +++ b/README.md @@ -76,23 +76,15 @@ RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --features download,doc --open ## MSRV -The MSRV is 1.48.0 for version 0.29.* if no feature is used, otherwise is 1.57 +The MSRV is 1.56.1 for version 0.35.* -Note: to respect 1.48.0 MSRV you need to use and older version of some dependencies, in CI the below +Note: to respect 1.56.1 MSRV you need to use and older version of some dependencies, in CI the below dependency versions are pinned: ```sh cargo update -cargo update -p which --precise 4.2.5 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 regex --precise 1.7.3 -cargo update -p thiserror --precise 1.0.40 -cargo update -p quote --precise 1.0.28 -cargo update -p syn:2.0.37 --precise 2.0.32 -cargo update -p proc-macro2 --precise 1.0.63 ``` Pinning in `Cargo.toml` is avoided because it could cause diff --git a/clippy.toml b/clippy.toml index 11d46a7..56ce04e 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1 +1 @@ -msrv = "1.48.0" +msrv = "1.56.1" diff --git a/src/lib.rs b/src/lib.rs index 69aa945..f30f929 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -331,7 +331,7 @@ impl BitcoinD { ); let mut process = Command::new(exe.as_ref()) - .args(&default_args) + .args(default_args) .args(&p2p_args) .args(&conf_args) .args(&zmq_args) @@ -608,7 +608,7 @@ mod test { assert_eq!(peers_connected(&other_bitcoind.client), 1); } - #[cfg(not(target_os = "windows"))] + #[cfg(not(target_os = "windows"))] // TODO: investigate why it doesn't work in windows #[test] fn test_data_persistence() { // Create a Conf with staticdir type