diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 033cc6d93..1a35da5f5 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -53,13 +53,13 @@ jobs: - name: "Run test script" run: ./maintainer-tools/ci/run_task.sh nightly - MSRV: # 1 jobs, minimal lock file only. - name: Test - 1.56.1 toolchain + MSRV: # 2 jobs, one per lock file. + name: Test - 1.63.0 toolchain runs-on: ubuntu-latest strategy: fail-fast: false matrix: - dep: [minimal] + dep: [minimal, recent] steps: - name: "Checkout repo" uses: actions/checkout@v4 @@ -71,7 +71,7 @@ jobs: - name: "Select toolchain" uses: dtolnay/rust-toolchain@stable with: - toolchain: "1.56.1" + toolchain: "1.63.0" - name: "Set dependencies" run: cp Cargo-${{ matrix.dep }}.lock Cargo.lock - name: "Run test script" diff --git a/Cargo-minimal.lock b/Cargo-minimal.lock index 6a79a1a8a..9b8d63f9e 100644 --- a/Cargo-minimal.lock +++ b/Cargo-minimal.lock @@ -245,9 +245,9 @@ checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd" [[package]] name = "honggfuzz" -version = "0.5.55" +version = "0.5.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848e9c511092e0daa0a35a63e8e6e475a3e8f870741448b9f6028d69b142f18e" +checksum = "7c76b6234c13c9ea73946d1379d33186151148e0da231506b964b44f3d023505" dependencies = [ "lazy_static", "memmap2", @@ -307,9 +307,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" -version = "0.5.10" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", ] diff --git a/Cargo-recent.lock b/Cargo-recent.lock index 75e6931eb..3aadd4ff7 100644 --- a/Cargo-recent.lock +++ b/Cargo-recent.lock @@ -223,9 +223,9 @@ checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd" [[package]] name = "honggfuzz" -version = "0.5.55" +version = "0.5.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848e9c511092e0daa0a35a63e8e6e475a3e8f870741448b9f6028d69b142f18e" +checksum = "7c76b6234c13c9ea73946d1379d33186151148e0da231506b964b44f3d023505" dependencies = [ "lazy_static", "memmap2", @@ -285,9 +285,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" -version = "0.5.10" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", ] diff --git a/Cargo.toml b/Cargo.toml index 9fa86f8b0..8501ff6d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,8 @@ repository = "https://github.com/rust-bitcoin/rust-miniscript/" description = "Miniscript: a subset of Bitcoin Script designed for analysis" keywords = [ "crypto", "bitcoin", "miniscript", "script" ] readme = "README.md" -edition = "2018" +edition = "2021" +rust-version = "1.63.0" [features] default = ["std"] diff --git a/README.md b/README.md index 9432b8962..6e638ff2a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![Build](https://github.com/rust-bitcoin/rust-miniscript/workflows/Continuous%20integration/badge.svg) -**Minimum Supported Rust Version:** 1.56.1 +**Minimum Supported Rust Version:** 1.63.0 # Miniscript @@ -41,7 +41,7 @@ Enabling the `no-std` feature does not disable `std`. To disable the `std` featu ## Minimum Supported Rust Version (MSRV) -This library should always compile with any combination of features on **Rust 1.56.1**. +This library should always compile with any combination of features on **Rust 1.63.0**. Some dependencies do not play nicely with our MSRV, if you are running the tests you may need to pin some dependencies. See `./contrib/test.sh` for current pinning. diff --git a/clippy.toml b/clippy.toml index ab03a348e..2edc417d1 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1,3 +1,3 @@ -msrv = "1.56.1" +msrv = "1.63.0" # plan API returns Self as an error type for an large-ish enum large-error-threshold = 256 diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 334350f21..353a9aa83 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "descriptor-fuzz" edition = "2021" -rust-version = "1.56.1" +rust-version = "1.63.0" version = "0.0.1" authors = ["Generated by fuzz/generate-files.sh"] publish = false @@ -10,7 +10,7 @@ publish = false cargo-fuzz = true [dependencies] -honggfuzz = { version = "0.5.55", default-features = false } +honggfuzz = { version = "0.5.56", default-features = false } miniscript = { path = "..", features = [ "compiler" ] } regex = "1.0" diff --git a/fuzz/generate-files.sh b/fuzz/generate-files.sh index 29f23d63e..8dabd7c9d 100755 --- a/fuzz/generate-files.sh +++ b/fuzz/generate-files.sh @@ -13,7 +13,7 @@ cat > "$REPO_DIR/fuzz/Cargo.toml" < Threshold { /// Constructs a threshold directly from a threshold value and collection. pub fn new(k: usize, inner: Vec) -> Result { if k == 0 || k > inner.len() || (MAX > 0 && inner.len() > MAX) { - Err(ThresholdError { k, n: inner.len(), max: (MAX > 0).then(|| MAX) }) + Err(ThresholdError { k, n: inner.len(), max: (MAX > 0).then_some(MAX) }) } else { Ok(Threshold { k, inner }) } @@ -68,7 +68,7 @@ impl Threshold { // Do an early return if our minimum size exceeds the max. if MAX > 0 && min_size > MAX { let n = iter.count(); - return Err(ThresholdError { k, n, max: (MAX > 0).then(|| MAX) }); + return Err(ThresholdError { k, n, max: (MAX > 0).then_some(MAX) }); } let mut inner = Vec::with_capacity(min_size);