Skip to content

Commit

Permalink
Bump MSRV to 1.60
Browse files Browse the repository at this point in the history
- `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.
  • Loading branch information
str4d committed Feb 10, 2023
1 parent 94b454c commit 09f9c09
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lints-stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ on: pull_request

jobs:
clippy:
name: Clippy (1.56.1)
name: Clippy (1.60.0)
timeout-minutes: 30
runs-on: ubuntu-latest

steps:
- 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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion halo2/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = [
"Jack Grigg <[email protected]>",
]
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"
Expand Down
2 changes: 1 addition & 1 deletion halo2_gadgets/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ authors = [
"Kris Nuttycombe <[email protected]>",
]
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"
Expand Down
2 changes: 1 addition & 1 deletion halo2_gadgets/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion halo2_proofs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = [
"Jack Grigg <[email protected]>",
]
edition = "2021"
rust-version = "1.56.1"
rust-version = "1.59"
description = """
Fast PLONK-based zero-knowledge proving system with no trusted setup
"""
Expand Down
2 changes: 1 addition & 1 deletion halo2_proofs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion rust-toolchain

This file was deleted.

2 changes: 2 additions & 0 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[toolchain]
channel = "1.60.0"

0 comments on commit 09f9c09

Please sign in to comment.