From 616b421967de1c31a61ed37b53319ebdee0c75f5 Mon Sep 17 00:00:00 2001 From: dante <45801863+alexander-camuto@users.noreply.github.com> Date: Thu, 25 Jul 2024 07:56:21 -0400 Subject: [PATCH] fix: bump compiler to latest to accomodate latest serde `diagnostic` (#830) --- .github/workflows/engine.yml | 4 +-- .github/workflows/large-tests.yml | 2 +- .github/workflows/pypi.yml | 4 +-- .github/workflows/release.yml | 14 ++++---- .github/workflows/rust.yml | 58 +++++++++++++++---------------- Cargo.lock | 37 ++++++++++++++++---- rust-toolchain | 2 +- 7 files changed, 73 insertions(+), 48 deletions(-) diff --git a/.github/workflows/engine.yml b/.github/workflows/engine.yml index 60c2906fc..72cf765e9 100644 --- a/.github/workflows/engine.yml +++ b/.github/workflows/engine.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - uses: jetli/wasm-pack-action@v0.4.0 @@ -30,7 +30,7 @@ jobs: run: rustup target add wasm32-unknown-unknown - name: Add rust-src - run: rustup component add rust-src --toolchain nightly-2024-02-06-x86_64-unknown-linux-gnu + run: rustup component add rust-src --toolchain nightly-2024-07-18-x86_64-unknown-linux-gnu - name: Install binaryen run: | set -e diff --git a/.github/workflows/large-tests.yml b/.github/workflows/large-tests.yml index 1faef259a..19f04a203 100644 --- a/.github/workflows/large-tests.yml +++ b/.github/workflows/large-tests.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - name: nanoGPT Mock diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index d65584dfd..55778d948 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -40,7 +40,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy @@ -86,7 +86,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 821702878..8ff484741 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,7 +45,7 @@ jobs: steps: - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - name: Checkout repo @@ -106,27 +106,27 @@ jobs: include: - build: windows-msvc os: windows-latest - rust: nightly-2024-02-06 + rust: nightly-2024-07-18 target: x86_64-pc-windows-msvc - build: macos os: macos-13 - rust: nightly-2024-02-06 + rust: nightly-2024-07-18 target: x86_64-apple-darwin - build: macos-aarch64 os: macos-13 - rust: nightly-2024-02-06 + rust: nightly-2024-07-18 target: aarch64-apple-darwin - build: linux-musl os: ubuntu-22.04 - rust: nightly-2024-02-06 + rust: nightly-2024-07-18 target: x86_64-unknown-linux-musl - build: linux-gnu os: ubuntu-22.04 - rust: nightly-2024-02-06 + rust: nightly-2024-07-18 target: x86_64-unknown-linux-gnu - build: linux-aarch64 os: ubuntu-22.04 - rust: nightly-2024-02-06 + rust: nightly-2024-07-18 target: aarch64-unknown-linux-gnu steps: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index d27de4d0f..1a012b054 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - name: Build @@ -38,7 +38,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - name: Docs @@ -50,7 +50,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@v1 @@ -73,7 +73,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@v1 @@ -106,7 +106,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@v1 @@ -139,7 +139,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@v1 @@ -172,7 +172,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@v1 @@ -189,7 +189,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - uses: jetli/wasm-pack-action@v0.4.0 @@ -199,7 +199,7 @@ jobs: - name: Install wasm32-unknown-unknown run: rustup target add wasm32-unknown-unknown - name: Add rust-src - run: rustup component add rust-src --toolchain nightly-2024-02-06-x86_64-unknown-linux-gnu + run: rustup component add rust-src --toolchain nightly-2024-07-18-x86_64-unknown-linux-gnu - name: Run wasm verifier tests # on mac: # AR=/opt/homebrew/opt/llvm/bin/llvm-ar CC=/opt/homebrew/opt/llvm/bin/clang wasm-pack test --firefox --headless -- -Z build-std="panic_abort,std" --features web @@ -212,7 +212,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@v1 @@ -229,7 +229,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@v1 @@ -290,7 +290,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@v1 @@ -308,7 +308,7 @@ jobs: node-version: "18.12.1" cache: "pnpm" - name: "Add rust-src" - run: rustup component add rust-src --toolchain nightly-2024-02-06-x86_64-unknown-linux-gnu + run: rustup component add rust-src --toolchain nightly-2024-07-18-x86_64-unknown-linux-gnu - name: Install dependencies for js tests and in-browser-evm-verifier package run: | pnpm install --frozen-lockfile @@ -330,7 +330,7 @@ jobs: - name: Install solc run: (hash svm 2>/dev/null || cargo install svm-rs) && svm install 0.8.20 && solc --version - name: Install Anvil - run: cargo install --git https://github.com/foundry-rs/foundry --rev c2233ec9fe61e0920c61c6d779bc707252852037 --profile local --locked anvil --force + run: cargo install --git https://github.com/foundry-rs/foundry --rev 62cdea8ff9e6efef011f77e295823b5f2dbeb3a1 --locked anvil --force - name: KZG prove and verify tests (EVM + VK rendered seperately) run: cargo nextest run --release --verbose tests_evm::kzg_evm_prove_and_verify_render_seperately_ --test-threads 1 - name: KZG prove and verify tests (EVM + kzg all) @@ -369,7 +369,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - uses: jetli/wasm-pack-action@v0.4.0 @@ -377,7 +377,7 @@ jobs: run: rustup target add wasm32-unknown-unknown - name: Add rust-src - run: rustup component add rust-src --toolchain nightly-2024-02-06-x86_64-unknown-linux-gnu + run: rustup component add rust-src --toolchain nightly-2024-07-18-x86_64-unknown-linux-gnu - uses: actions/checkout@v3 - name: Use pnpm 8 uses: pnpm/action-setup@v2 @@ -443,11 +443,11 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - name: Add rust-src - run: rustup component add rust-src --toolchain nightly-2024-02-06-x86_64-unknown-linux-gnu + run: rustup component add rust-src --toolchain nightly-2024-07-18-x86_64-unknown-linux-gnu - uses: actions/checkout@v3 - uses: baptiste0928/cargo-install@v1 with: @@ -477,7 +477,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@v1 @@ -495,7 +495,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@v1 @@ -512,7 +512,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@v1 @@ -529,7 +529,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@v1 @@ -539,7 +539,7 @@ jobs: - name: Install solc run: (hash svm 2>/dev/null || cargo install svm-rs) && svm install 0.8.20 && solc --version - name: Install Anvil - run: cargo install --git https://github.com/foundry-rs/foundry --rev c2233ec9fe61e0920c61c6d779bc707252852037 --profile local --locked anvil --force + run: cargo install --git https://github.com/foundry-rs/foundry --rev 62cdea8ff9e6efef011f77e295823b5f2dbeb3a1 --locked anvil --force - name: KZG prove and verify aggr tests run: cargo nextest run --release --verbose tests_evm::kzg_evm_aggr_prove_and_verify_::t --test-threads 4 -- --include-ignored @@ -550,7 +550,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@v1 @@ -570,7 +570,7 @@ jobs: python-version: "3.12" - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - name: Install cmake @@ -580,7 +580,7 @@ jobs: - name: Setup Virtual Env and Install python dependencies run: python -m venv .env --clear; source .env/bin/activate; pip install -r requirements.txt; - name: Install Anvil - run: cargo install --git https://github.com/foundry-rs/foundry --rev c2233ec9fe61e0920c61c6d779bc707252852037 --profile local --locked anvil --force + run: cargo install --git https://github.com/foundry-rs/foundry --rev 62cdea8ff9e6efef011f77e295823b5f2dbeb3a1 --locked anvil --force - name: Build python ezkl run: source .env/bin/activate; unset CONDA_PREFIX; maturin develop --features python-bindings --release - name: Run pytest @@ -596,7 +596,7 @@ jobs: python-version: "3.12" - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@v1 @@ -645,7 +645,7 @@ jobs: python-version: "3.11" - uses: actions-rs/toolchain@v1 with: - toolchain: nightly-2024-02-06 + toolchain: nightly-2024-07-18 override: true components: rustfmt, clippy - uses: baptiste0928/cargo-install@v1 @@ -655,7 +655,7 @@ jobs: - name: Install solc run: (hash svm 2>/dev/null || cargo install svm-rs) && svm install 0.8.20 && solc --version - name: Install Anvil - run: cargo install --git https://github.com/foundry-rs/foundry --rev c2233ec9fe61e0920c61c6d779bc707252852037 --profile local --locked anvil --force + run: cargo install --git https://github.com/foundry-rs/foundry --rev 62cdea8ff9e6efef011f77e295823b5f2dbeb3a1 --locked anvil --force - name: Install pip run: python -m ensurepip --upgrade - name: Setup Virtual Env and Install python dependencies diff --git a/Cargo.lock b/Cargo.lock index 94abbfb1e..59c988cbd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1536,6 +1536,15 @@ dependencies = [ "zeroize", ] +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + [[package]] name = "derivative" version = "2.2.0" @@ -3262,6 +3271,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-integer" version = "0.1.46" @@ -3775,6 +3790,12 @@ dependencies = [ "postgres-protocol", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -5217,11 +5238,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.23" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ + "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", "time-macros", @@ -5229,16 +5253,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.10" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] diff --git a/rust-toolchain b/rust-toolchain index b220e5d37..9c738d7fa 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2024-02-06" +channel = "nightly-2024-07-18" components = ["rustfmt", "clippy"]