Skip to content

Commit

Permalink
chore: upgrade Rust toolchain to 1.81.0 (#1559)
Browse files Browse the repository at this point in the history
  • Loading branch information
xJonathanLEI authored Sep 28, 2024
1 parent 19f34b0 commit 5086f7c
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 25 deletions.
6 changes: 3 additions & 3 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ runs:
~/.cargo/git/db/
target/
~/.rustup/
key: rust-1.79.0-${{ hashFiles('**/Cargo.toml') }}
restore-keys: rust-1.79.0-
key: rust-1.81.0-${{ hashFiles('**/Cargo.toml') }}
restore-keys: rust-1.81.0-

- name: Setup toolchain
id: rustc-toolchain
shell: bash
run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain 1.79.0 -y
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain 1.81.0 -y
2 changes: 1 addition & 1 deletion .github/workflows/docker-gnark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ jobs:
SP1_GNARK_IMAGE: sp1-gnark
with:
command: test
toolchain: 1.79.0
toolchain: 1.81.0
args: --release -p sp1-prover -- --exact tests::test_e2e
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: test
toolchain: 1.79.0
toolchain: 1.81.0
args: --release -p sp1-sdk --features native-gnark -- test_e2e_prove_plonk --nocapture
env:
RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: test
toolchain: 1.79.0
toolchain: 1.81.0
args: --release -p sp1-sdk -- test_e2e_prove_plonk --nocapture
env:
RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
Expand Down Expand Up @@ -220,14 +220,14 @@ jobs:
~/.cargo/git/db/
target/
~/.rustup/
key: rust-1.79.0-${{ hashFiles('**/Cargo.toml') }}
restore-keys: rust-1.79.0-
key: rust-1.81.0-${{ hashFiles('**/Cargo.toml') }}
restore-keys: rust-1.81.0-

- name: Setup toolchain
id: rustc-toolchain
shell: bash
run: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain 1.79.0 -y
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain 1.81.0 -y
- name: Run script
run: |
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: check
toolchain: 1.79.0
toolchain: 1.81.0
args: --all-targets --all-features

- name: Run cargo test core-v2
uses: actions-rs/cargo@v1
with:
command: test
toolchain: 1.79.0
toolchain: 1.81.0
args: --release --package sp1-recursion-core-v2 --package sp1-recursion-circuit-v2 --features native-gnark
env:
RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
Expand Down Expand Up @@ -71,14 +71,14 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: check
toolchain: 1.79.0
toolchain: 1.81.0
args: --all-targets --all-features

- name: Run cargo test
uses: actions-rs/cargo@v1
with:
command: test
toolchain: 1.79.0
toolchain: 1.81.0
args: --release --features native-gnark
env:
RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
Expand Down Expand Up @@ -108,14 +108,14 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: check
toolchain: 1.79.0
toolchain: 1.81.0
args: --all-targets --all-features

- name: Run cargo test
uses: actions-rs/cargo@v1
with:
command: test
toolchain: 1.79.0
toolchain: 1.81.0
args: --release --features native-gnark
env:
RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
id: rustc-toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: 1.79.0
toolchain: 1.81.0
profile: minimal
override: true
targets: ${{ matrix.target }}
Expand Down
2 changes: 1 addition & 1 deletion book/developers/usage-in-ci.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ You first need have Rust installed, and you can use
- name: Install Rust Toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: 1.79.0
toolchain: 1.81.0
profile: default
override: true
default: true
Expand Down
2 changes: 1 addition & 1 deletion crates/build/src/command/local.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ pub(crate) fn create_local_command(
.env("CARGO_ENCODED_RUSTFLAGS", get_rust_compiler_flags())
.env_remove("RUSTC")
.env("CARGO_TARGET_DIR", program_metadata.target_directory.join(HELPER_TARGET_SUBDIR))
.args(&get_program_build_args(args));
.args(get_program_build_args(args));
command
}
2 changes: 1 addition & 1 deletion crates/cli/src/commands/build_toolchain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ impl BuildToolchainCmd {
for tool in tools_bin_dir.read_dir()? {
let tool = tool?;
let tool_name = tool.file_name();
std::fs::copy(&tool.path(), target_bin_dir.join(tool_name))?;
std::fs::copy(tool.path(), target_bin_dir.join(tool_name))?;
}

// Link the toolchain to rustup.
Expand Down
2 changes: 1 addition & 1 deletion crates/core/executor/src/hook.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ pub struct HookEnv<'a, 'b: 'a> {
/// * `env` - The environment in which the hook is invoked.
/// * `buf` - The buffer containing the signature and message hash.
/// - The signature is 65 bytes, the first 64 bytes are the signature and the last byte is the
/// recovery ID.
/// recovery ID.
/// - The message hash is 32 bytes.
///
/// The result is returned as a pair of bytes, where the first 32 bytes are the X coordinate
Expand Down
5 changes: 2 additions & 3 deletions crates/recursion/core/src/range_check/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@ impl<F: Field> RangeCheckChip<F> {
/// Creates the preprocessed range check trace and event map.
///
/// This function returns a pair `(trace, map)`, where:
/// - `trace` is a matrix containing all possible range check values.
/// - `trace` is a matrix containing all possible range check values.
/// - `map` is a map from a range check lookup to the value's corresponding row it appears in
/// the table and
/// the index of the result in the array of multiplicities.
/// the table and the index of the result in the array of multiplicities.
pub fn trace_and_map() -> (RowMajorMatrix<F>, BTreeMap<RangeCheckEvent, (usize, usize)>) {
// A map from a byte lookup to its corresponding row in the table and index in the array of
// multiplicities.
Expand Down
2 changes: 1 addition & 1 deletion crates/recursion/program/src/machine/deferred.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ where
/// verifier:
/// - Asserts that each of these proofs is valid as a `compress` proof.
/// - Asserts that each of these proofs is complete by checking the `is_complete` flag in the
/// proof's public values.
/// proof's public values.
/// - Aggregates the proof information into the accumulated deferred digest.
pub fn verify(
builder: &mut Builder<C>,
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.79.0"
channel = "1.81.0"
components = ["llvm-tools", "rustc-dev"]

0 comments on commit 5086f7c

Please sign in to comment.