upgrade rust to 1.74.1 (#1239)

* upgrade rust * fix clippy * fix clippy for benches * fix clippy for benches * go back to 1.72.1 * Update Rust version. * missing rust updates --------- Co-authored-by: Esteve Soler Arderiu <[email protected]> Co-authored-by: Edgar Luque <[email protected]> Co-authored-by: Pedro Fontana <[email protected]>
lambdaclass · Feb 19, 2024 · b7a60e3 · b7a60e3
1 parent 8704fd3
commit b7a60e3
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 15 deletions.
diff --git a/.github/workflows/rust-tests.yml b/.github/workflows/rust-tests.yml
@@ -9,7 +9,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_TOOLCHAIN: '1.72.1'
+  RUST_TOOLCHAIN: '1.74.1'
 
 jobs:
   build:
@@ -170,7 +170,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Install Rust
-      uses: dtolnay/rust-toolchain@1.70.0
+      uses: dtolnay/rust-toolchain@1.74.1
       with:
           components: llvm-tools-preview
 

diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ It makes use of [cairo-vm](https://github.com/lambdaclass/cairo-vm), the Rust im
 ## 🌅 Getting Started
 
 ### Dependencies
-- Rust 1.70
+- Rust 1.74.1
 - A working installation of cairo-lang 0.12 (for compiling the cairo files)
 - [Optional, for testing purposes] Heaptrack
 

diff --git a/bench/yas.rs b/bench/yas.rs
@@ -283,9 +283,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut state = loop {
         let mut state = state.clone();
 
-        let yas_router_address = yas_router_address;
-        let yas_pool_address = yas_pool_address;
-
         // Swap (invoke).
         info!("Swapping tokens.");
         let t0 = Instant::now();

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.72.1"
+channel = "1.74.1"
 components = ["rustfmt", "clippy"]
 profile = "minimal"
diff --git a/src/transaction/fee.rs b/src/transaction/fee.rs
@@ -221,7 +221,7 @@ pub(crate) fn check_fee_bounds(
         VersionSpecificAccountTxFields::Current(fields) => {
             // Check l1_gas amount
             if (fields.l1_resource_bounds.max_amount as u128) < minimal_l1_gas_amount {
-                return Err(TransactionError::MaxL1GasAmountTooLow(
+                Err(TransactionError::MaxL1GasAmountTooLow(
                     fields.l1_resource_bounds.max_amount,
                     minimal_l1_gas_amount,
                 ))?;
@@ -230,7 +230,7 @@ pub(crate) fn check_fee_bounds(
             let actual_gas_price =
                 block_context.get_gas_price_by_fee_type(&account_tx_fields.fee_type());
             if fields.l1_resource_bounds.max_price_per_unit < actual_gas_price {
-                return Err(TransactionError::MaxL1GasPriceTooLow(
+                Err(TransactionError::MaxL1GasPriceTooLow(
                     fields.l1_resource_bounds.max_price_per_unit,
                     actual_gas_price,
                 ))?;

diff --git a/tests/integration_tests/yas_bench_test.rs b/tests/integration_tests/yas_bench_test.rs
@@ -234,12 +234,6 @@ fn compare_yas_bench() -> Result<(), Box<dyn std::error::Error>> {
     // Execute swaps
 
     for _ in 0..5 {
-        let yas_router_address_jit = yas_router_address_jit;
-        let yas_pool_address_jit = yas_pool_address_jit;
-
-        let yas_router_address_vm = yas_router_address_vm;
-        let yas_pool_address_vm = yas_pool_address_vm;
-
         swap(
             &mut state_jit,
             program_cache_jit.clone(),