From eee921494a90ab7cc14dfa966a2e8043a9566e21 Mon Sep 17 00:00:00 2001 From: Edgar Luque Date: Mon, 21 Oct 2024 09:37:28 +0200 Subject: [PATCH] Update rust to 1.82.0 --- .github/workflows/bench-hyperfine.yml | 4 ++-- .github/workflows/ci.yml | 10 +++++----- .github/workflows/publish.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/rustdoc.yml | 2 +- rust-toolchain.toml | 2 +- src/executor.rs | 15 ++++++++------- 7 files changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/bench-hyperfine.yml b/.github/workflows/bench-hyperfine.yml index 6182f709d..02a123f3d 100644 --- a/.github/workflows/bench-hyperfine.yml +++ b/.github/workflows/bench-hyperfine.yml @@ -43,7 +43,7 @@ jobs: sudo rm -rf /usr/share/dotnet/ sudo rm -rf /usr/local/lib/android df -h - - uses: dtolnay/rust-toolchain@1.81.0 + - uses: dtolnay/rust-toolchain@1.82.0 with: components: clippy - uses: Swatinem/rust-cache@v2 @@ -136,7 +136,7 @@ jobs: - name: Install Rust if: ${{ steps.cache-binary.outputs.cache-hit != 'true' || steps.cache-library.outputs.cache-hit != 'true' }} - uses: dtolnay/rust-toolchain@1.81.0 + uses: dtolnay/rust-toolchain@1.82.0 - name: add llvm deb repository if: ${{ steps.cache-binary.outputs.cache-hit != 'true' || steps.cache-library.outputs.cache-hit != 'true' }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 37d2f612e..f4e94c78d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: TABLEGEN_190_PREFIX: /usr/lib/llvm-19/ steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@1.81.0 + - uses: dtolnay/rust-toolchain@1.82.0 with: components: clippy, rustfmt - uses: Swatinem/rust-cache@v2 @@ -41,7 +41,7 @@ jobs: runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@1.81.0 + - uses: dtolnay/rust-toolchain@1.82.0 with: components: rustfmt - run: cargo fmt --all -- --check @@ -134,7 +134,7 @@ jobs: sudo rm -rf /usr/local/lib/android df -h - name: Setup rust env - uses: dtolnay/rust-toolchain@1.81.0 + uses: dtolnay/rust-toolchain@1.82.0 - name: Retreive cached dependecies uses: Swatinem/rust-cache@v2 - name: add llvm deb repository @@ -166,7 +166,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Rustup toolchain install - uses: dtolnay/rust-toolchain@1.81.0 + uses: dtolnay/rust-toolchain@1.82.0 with: components: clippy - name: Rust `$PATH` workaround. @@ -225,7 +225,7 @@ jobs: sudo rm -rf /usr/local/lib/android df -h - name: Setup rust env - uses: dtolnay/rust-toolchain@1.81.0 + uses: dtolnay/rust-toolchain@1.82.0 - name: Retreive cached dependecies uses: Swatinem/rust-cache@v2 - name: add llvm deb repository diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 994bdd853..812efdb14 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -26,7 +26,7 @@ jobs: sudo rm -rf /usr/share/dotnet/ sudo rm -rf /usr/local/lib/android - name: Setup rust env - uses: dtolnay/rust-toolchain@1.81.0 + uses: dtolnay/rust-toolchain@1.82.0 - name: Retreive cached dependecies uses: Swatinem/rust-cache@v2 - name: add llvm deb repository diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d9ec91f76..404d425ba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: sudo rm -rf /usr/share/dotnet/ sudo rm -rf /usr/local/lib/android - name: Setup rust env - uses: dtolnay/rust-toolchain@1.81.0 + uses: dtolnay/rust-toolchain@1.82.0 - name: Retreive cached dependecies uses: Swatinem/rust-cache@v2 - name: add llvm deb repository diff --git a/.github/workflows/rustdoc.yml b/.github/workflows/rustdoc.yml index afcc7c42f..93e31f0d4 100644 --- a/.github/workflows/rustdoc.yml +++ b/.github/workflows/rustdoc.yml @@ -18,7 +18,7 @@ jobs: TABLEGEN_190_PREFIX: /usr/lib/llvm-19/ steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@1.81.0 + - uses: dtolnay/rust-toolchain@1.82.0 - uses: Swatinem/rust-cache@v2 - name: add llvm deb repository uses: myci-actions/add-deb-repo@11 diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 5988090d1..0127c3479 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.81.0" +channel = "1.82.0" components = ["rustfmt", "clippy"] profile = "minimal" diff --git a/src/executor.rs b/src/executor.rs index f88e87735..914a1562e 100644 --- a/src/executor.rs +++ b/src/executor.rs @@ -257,13 +257,14 @@ fn invoke_dynamic( } }); } - CoreTypeConcrete::StarkNet(StarkNetTypeConcrete::System(_)) => match &mut return_ptr { - Some(return_ptr) => unsafe { - let ptr = return_ptr.cast::<*mut ()>(); - *return_ptr = NonNull::new_unchecked(ptr.as_ptr().add(1)).cast(); - }, - None => {} - }, + CoreTypeConcrete::StarkNet(StarkNetTypeConcrete::System(_)) => { + if let Some(return_ptr) = &mut return_ptr { + unsafe { + let ptr = return_ptr.cast::<*mut ()>(); + *return_ptr = NonNull::new_unchecked(ptr.as_ptr().add(1)).cast(); + } + } + } _ if type_info.is_builtin() => { if !type_info.is_zst(registry)? { if let CoreTypeConcrete::BuiltinCosts(_) = type_info {