Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Install Rust
uses: dtolnay/rust-toolchain@1.86.0
uses: dtolnay/rust-toolchain@1.87.0
with:
components: rustfmt, clippy
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cairo_1_programs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@1.86.0
uses: dtolnay/rust-toolchain@1.87.0
- name: Set up Cargo cache
uses: Swatinem/rust-cache@v2
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fresh_run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
uses: actions/checkout@v4

- name: Install Rust
uses: dtolnay/rust-toolchain@1.86.0
uses: dtolnay/rust-toolchain@1.87.0

- name: Install Pyenv
uses: "gabrielfalcao/pyenv-action@v13"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hint_accountant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@1.86.0
uses: dtolnay/rust-toolchain@1.87.0
- name: Set up Cargo cache
uses: Swatinem/rust-cache@v2
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hyper_threading_benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
sudo apt-get install -y hyperfine

- name: Install Rust
uses: dtolnay/rust-toolchain@1.86.0
uses: dtolnay/rust-toolchain@1.87.0
with:
components: rustfmt, clippy

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hyperfine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:

- name: Install Rust
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
uses: dtolnay/rust-toolchain@1.86.0
uses: dtolnay/rust-toolchain@1.87.0

- name: Checkout
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/iai_main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Install Rust
uses: dtolnay/rust-toolchain@1.86.0
uses: dtolnay/rust-toolchain@1.87.0
- name: Set up cargo cache
uses: Swatinem/rust-cache@v2
- name: Python3 Build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/iai_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

- name: Install Rust
if: ${{ steps.cache-iai-results.outputs.cache-hit != 'true' }}
uses: dtolnay/rust-toolchain@1.86.0
uses: dtolnay/rust-toolchain@1.87.0
- name: Set up cargo cache
if: ${{ steps.cache-iai-results.outputs.cache-hit != 'true' }}
uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Install Rust
uses: dtolnay/rust-toolchain@1.86.0
uses: dtolnay/rust-toolchain@1.87.0
- name: Set up cargo cache
uses: Swatinem/rust-cache@v2
- name: Python3 Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v4
- name: Install stable toolchain
uses: dtolnay/rust-toolchain@1.86.0
uses: dtolnay/rust-toolchain@1.87.0
- name: Publish crate cairo-vm
env:
CRATES_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Install Rust
uses: dtolnay/rust-toolchain@1.86.0
uses: dtolnay/rust-toolchain@1.87.0
with:
components: rustfmt, clippy
- name: Set up cargo cache
Expand Down Expand Up @@ -199,7 +199,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Install Rust
uses: dtolnay/rust-toolchain@1.86.0
uses: dtolnay/rust-toolchain@1.87.0
with:
targets: wasm32-unknown-unknown

Expand Down Expand Up @@ -245,7 +245,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Install Rust
uses: dtolnay/rust-toolchain@1.86.0
uses: dtolnay/rust-toolchain@1.87.0
with:
targets: wasm32-unknown-unknown

Expand Down Expand Up @@ -285,7 +285,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Install Rust
uses: dtolnay/rust-toolchain@1.86.0
uses: dtolnay/rust-toolchain@1.87.0
with:
targets: wasm32-unknown-unknown

Expand Down Expand Up @@ -327,7 +327,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Install Rust
uses: dtolnay/rust-toolchain@1.86.0
uses: dtolnay/rust-toolchain@1.87.0
with:
components: llvm-tools-preview
- name: Set up cargo cache
Expand Down Expand Up @@ -393,7 +393,7 @@ jobs:
runs-on: ubuntu-24.04
steps:
- name: Install Rust
uses: dtolnay/rust-toolchain@1.86.0
uses: dtolnay/rust-toolchain@1.87.0
- name: Set up cargo cache
uses: Swatinem/rust-cache@v2
- name: Checkout
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

#### Upcoming Changes

* chore: update Rust required version to 1.87.0 #[2100](https://github.com/lambdaclass/cairo-vm/pull/2100)

#### [3.0.0-rc.1] - 2025-05-08

* chore: bump pip `cairo-lang` 0.13.5 [#1959](https://github.com/lambdaclass/cairo-vm/pull/1959)
Expand Down
2 changes: 2 additions & 0 deletions cairo-vm-cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ fn start_tracer(cairo_runner: &CairoRunner) -> Result<(), TraceDataError> {
Ok(())
}

#[allow(clippy::result_large_err)]
fn run(args: impl Iterator<Item = String>) -> Result<(), Error> {
let args = Args::try_parse_from(args)?;

Expand Down Expand Up @@ -281,6 +282,7 @@ fn run(args: impl Iterator<Item = String>) -> Result<(), Error> {
Ok(())
}

#[allow(clippy::result_large_err)]
fn main() -> Result<(), Error> {
#[cfg(test)]
return Ok(());
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.86.0"
channel = "1.87.0"
components = ["rustfmt", "clippy"]
profile = "minimal"
7 changes: 7 additions & 0 deletions vm/src/cairo_run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ impl Default for CairoRunConfig<'_> {
}
}

#[allow(clippy::result_large_err)]
/// Runs a program with a customized execution scope.
pub fn cairo_run_program_with_initial_scope(
program: &Program,
Expand Down Expand Up @@ -118,6 +119,7 @@ pub fn cairo_run_program_with_initial_scope(
Ok(cairo_runner)
}

#[allow(clippy::result_large_err)]
pub fn cairo_run_program(
program: &Program,
cairo_run_config: &CairoRunConfig,
Expand All @@ -131,6 +133,7 @@ pub fn cairo_run_program(
)
}

#[allow(clippy::result_large_err)]
pub fn cairo_run(
program_content: &[u8],
cairo_run_config: &CairoRunConfig,
Expand All @@ -140,6 +143,8 @@ pub fn cairo_run(

cairo_run_program(&program, cairo_run_config, hint_processor)
}

#[allow(clippy::result_large_err)]
/// Runs a Cairo PIE generated by a previous cairo execution
/// To generate a cairo pie use the runner's method `get_cairo_pie`
/// Note: Cairo PIEs cannot be ran in proof_mode
Expand Down Expand Up @@ -224,6 +229,7 @@ pub fn cairo_run_pie(
}

#[cfg(feature = "test_utils")]
#[allow(clippy::result_large_err)]
pub fn cairo_run_fuzzed_program(
program: Program,
cairo_run_config: &CairoRunConfig,
Expand Down Expand Up @@ -340,6 +346,7 @@ mod tests {
#[cfg(target_arch = "wasm32")]
use wasm_bindgen_test::*;

#[allow(clippy::result_large_err)]
fn run_test_program(
program_content: &[u8],
hint_processor: &mut dyn HintProcessor,
Expand Down
1 change: 1 addition & 0 deletions vm/src/tests/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ fn run_cairo_1_entrypoint(
}

#[cfg(feature = "cairo-1-hints")]
#[allow(clippy::result_large_err)]
/// Equals to fn run_cairo_1_entrypoint
/// But with run_resources as an input
fn run_cairo_1_entrypoint_with_run_resources(
Expand Down
2 changes: 1 addition & 1 deletion vm/src/vm/runners/cairo_runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1131,6 +1131,7 @@ impl CairoRunner {
Ok(())
}

#[allow(clippy::result_large_err)]
/// Runs a cairo program from a give entrypoint, indicated by its pc offset, with the given arguments.
/// If `verify_secure` is set to true, [verify_secure_runner] will be called to run extra verifications.
/// `program_segment_size` is only used by the [verify_secure_runner] function and will be ignored if `verify_secure` is set to false.
Expand Down Expand Up @@ -5135,7 +5136,6 @@ mod tests {

#[test]
#[cfg_attr(target_arch = "wasm32", wasm_bindgen_test)]

fn filter_unused_builtins_test() {
let program = Program::from_bytes(
include_bytes!("../../../../cairo_programs/integration.json"),
Expand Down
Loading