From 09f9c095d01b4d22cef5af8bc6796c11dbfcc1a6 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Fri, 10 Feb 2023 17:48:42 +0000 Subject: [PATCH] Bump MSRV to 1.60 - `blake2b_simd 1.0.1` raised its MSRV to 1.59. - `proptest 1.1.0` added a dependency on `unarray` which has an implicit MSRV of 1.60. --- .github/workflows/bench.yml | 2 +- .github/workflows/ci.yml | 10 +++++----- .github/workflows/lints-stable.yml | 6 +++--- README.md | 2 +- halo2/Cargo.toml | 2 +- halo2_gadgets/Cargo.toml | 2 +- halo2_gadgets/README.md | 2 +- halo2_proofs/Cargo.toml | 2 +- halo2_proofs/README.md | 2 +- rust-toolchain | 1 - rust-toolchain.toml | 2 ++ 11 files changed, 17 insertions(+), 16 deletions(-) delete mode 100644 rust-toolchain create mode 100644 rust-toolchain.toml diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index c948247ae3..eee9f16aca 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.56.1 + toolchain: 1.60.0 override: true - name: Run benchmark run: cargo bench -- --output-format bencher | tee output.txt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bd37431e4e..6a9274d89a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.56.1 + toolchain: 1.60.0 override: true - name: Run tests uses: actions-rs/cargo@v1 @@ -43,7 +43,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.56.1 + toolchain: 1.60.0 override: true - name: Add target run: rustup target add ${{ matrix.target }} @@ -79,7 +79,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.56.1 + toolchain: 1.60.0 override: true - name: cargo build uses: actions-rs/cargo@v1 @@ -124,7 +124,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.56.1 + toolchain: 1.60.0 override: true - name: cargo fetch uses: actions-rs/cargo@v1 @@ -147,7 +147,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.56.1 + toolchain: 1.60.0 override: true - run: rustup component add rustfmt - uses: actions-rs/cargo@v1 diff --git a/.github/workflows/lints-stable.yml b/.github/workflows/lints-stable.yml index b12d3c0de8..8f2000a64e 100644 --- a/.github/workflows/lints-stable.yml +++ b/.github/workflows/lints-stable.yml @@ -5,7 +5,7 @@ on: pull_request jobs: clippy: - name: Clippy (1.56.1) + name: Clippy (1.60.0) timeout-minutes: 30 runs-on: ubuntu-latest @@ -13,12 +13,12 @@ jobs: - uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: - toolchain: 1.56.1 + toolchain: 1.60.0 components: clippy override: true - name: Run clippy uses: actions-rs/clippy-check@v1 with: - name: Clippy (1.56.1) + name: Clippy (1.60.0) token: ${{ secrets.GITHUB_TOKEN }} args: --all-features --all-targets -- -D warnings diff --git a/README.md b/README.md index 69167e0716..1f0c4e41f1 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ## Minimum Supported Rust Version -Requires Rust **1.56.1** or higher. +Requires Rust **1.60** or higher. Minimum supported Rust version can be changed in the future, but it will be done with a minor version bump. diff --git a/halo2/Cargo.toml b/halo2/Cargo.toml index 7a6bbaa94f..ffe105cf21 100644 --- a/halo2/Cargo.toml +++ b/halo2/Cargo.toml @@ -5,7 +5,7 @@ authors = [ "Jack Grigg ", ] edition = "2021" -rust-version = "1.56.1" +rust-version = "1.59" description = "[BETA] Fast zero-knowledge proof-carrying data implementation with no trusted setup" license = "MIT OR Apache-2.0" repository = "https://github.com/zcash/halo2" diff --git a/halo2_gadgets/Cargo.toml b/halo2_gadgets/Cargo.toml index c21cf0f38b..ed2bdcfc1b 100644 --- a/halo2_gadgets/Cargo.toml +++ b/halo2_gadgets/Cargo.toml @@ -9,7 +9,7 @@ authors = [ "Kris Nuttycombe ", ] edition = "2021" -rust-version = "1.56.1" +rust-version = "1.59" description = "Reusable gadgets and chip implementations for Halo 2" license = "MIT OR Apache-2.0" repository = "https://github.com/zcash/halo2" diff --git a/halo2_gadgets/README.md b/halo2_gadgets/README.md index 4ed744f81f..90a803c093 100644 --- a/halo2_gadgets/README.md +++ b/halo2_gadgets/README.md @@ -1,6 +1,6 @@ # halo2_gadgets [![Crates.io](https://img.shields.io/crates/v/halo2_gadgets.svg)](https://crates.io/crates/halo2_gadgets) # -Requires Rust 1.56.1+. +Requires Rust 1.60+. ## Documentation diff --git a/halo2_proofs/Cargo.toml b/halo2_proofs/Cargo.toml index 4319eb7558..4a6d1ac53f 100644 --- a/halo2_proofs/Cargo.toml +++ b/halo2_proofs/Cargo.toml @@ -8,7 +8,7 @@ authors = [ "Jack Grigg ", ] edition = "2021" -rust-version = "1.56.1" +rust-version = "1.59" description = """ Fast PLONK-based zero-knowledge proving system with no trusted setup """ diff --git a/halo2_proofs/README.md b/halo2_proofs/README.md index 7c226ff24c..26597d5abc 100644 --- a/halo2_proofs/README.md +++ b/halo2_proofs/README.md @@ -4,7 +4,7 @@ ## Minimum Supported Rust Version -Requires Rust **1.56.1** or higher. +Requires Rust **1.60** or higher. Minimum supported Rust version can be changed in the future, but it will be done with a minor version bump. diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index 43c989b553..0000000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.56.1 diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000000..948d27daa4 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "1.60.0"