Make it compile again after rebase + cargo fmt

Author: Golovanov399

crates/sdk/src/prover/vm/local.rs

@@ -99,7 +99,7 @@ where
                 exe.clone(),
                 input.clone(),
                 |seg_idx, mut seg| {
-                    final_memory = mem::take(&mut seg.control.final_memory);
+                    final_memory = mem::take(&mut seg.ctrl.final_memory);
                     let proof_input = info_span!("trace_gen", segment = seg_idx)
                         .in_scope(|| seg.generate_proof_input(Some(committed_program.clone())))?;
                     info_span!("prove_segment", segment = seg_idx)

crates/vm/src/arch/execution_mode/metered/exact.rs

@@ -277,7 +277,8 @@ impl E1E2ExecutionCtx for MeteredCtxExact {
         self.update_adapter_heights(address_space, ptr, size);
 
         // Handle merkle tree updates
-        // TODO(ayush): see if this can be approximated by total number of reads/writes for AS != register
+        // TODO(ayush): see if this can be approximated by total number of reads/writes for AS !=
+        // register
         self.update_boundary_merkle_heights(address_space, ptr, size);
     }
 }

crates/vm/src/arch/execution_mode/metered/mod.rs

@@ -3,7 +3,6 @@ pub mod exact;
 
 // pub use exact::MeteredCtxExact as MeteredCtx;
 pub use bounded::MeteredCtxBounded as MeteredCtx;
-
 use openvm_instructions::instruction::Instruction;
 use openvm_stark_backend::{p3_field::PrimeField32, ChipUsageGetter};
 
@@ -119,7 +118,8 @@ where
         state: &mut VmSegmentState<Self::Ctx>,
         chip_complex: &mut VmChipComplex<F, VC::Executor, VC::Periphery>,
     ) {
-        // Program | Connector | Public Values | Memory ... | Executors (except Public Values) | Range Checker
+        // Program | Connector | Public Values | Memory ... | Executors (except Public Values) |
+        // Range Checker
         state.ctx.trace_heights[PROGRAM_AIR_ID] =
             chip_complex.program_chip().true_program_length as u32;
         state.ctx.trace_heights[CONNECTOR_AIR_ID] = 2;

crates/vm/src/arch/segment.rs

@@ -1,13 +1,3 @@
-use super::{
-    execution_control::ExecutionControl, ExecutionError, GenerationError, SystemConfig,
-    VmChipComplex, VmComplexTraceHeights, VmConfig,
-};
-#[cfg(feature = "bench-metrics")]
-use crate::metrics::VmMetrics;
-use crate::{
-    arch::{instructions::*, InstructionExecutor},
-    system::memory::online::GuestMemory,
-};
 use backtrace::Backtrace;
 use openvm_instructions::{
     exe::FnBounds,
@@ -23,6 +13,17 @@ use openvm_stark_backend::{
     Chip,
 };
 
+use super::{
+    execution_control::ExecutionControl, ExecutionError, GenerationError, SystemConfig,
+    VmChipComplex, VmComplexTraceHeights, VmConfig,
+};
+#[cfg(feature = "bench-metrics")]
+use crate::metrics::VmMetrics;
+use crate::{
+    arch::{instructions::*, InstructionExecutor},
+    system::memory::online::GuestMemory,
+};
+
 pub struct VmSegmentState<Ctx> {
     pub clk: u64,
     pub pc: u32,

extensions/keccak256/circuit/src/lib.rs

@@ -3,7 +3,6 @@
 
 use openvm_circuit_primitives::bitwise_op_lookup::SharedBitwiseOperationLookupChip;
 use openvm_stark_backend::p3_field::PrimeField32;
-
 use p3_keccak_air::NUM_ROUNDS;
 use tiny_keccak::{Hasher, Keccak};
 

extensions/native/circuit/src/adapters/alu_native_adapter.rs

@@ -24,13 +24,12 @@ use openvm_stark_backend::{
     p3_field::{Field, FieldAlgebra, PrimeField32},
 };
 
+use super::tracing_write_native;
 use crate::adapters::{
     memory_read_or_imm_native_from_state, memory_write_native_from_state,
     tracing_read_or_imm_native,
 };
 
-use super::tracing_write_native;
-
 #[repr(C)]
 #[derive(AlignedBorrow)]
 pub struct AluNativeAdapterCols<T> {

extensions/native/circuit/src/adapters/branch_native_adapter.rs

@@ -3,12 +3,11 @@ use std::{
     mem::size_of,
 };
 
-use openvm_circuit::arch::execution_mode::E1E2ExecutionCtx;
-use openvm_circuit::arch::VmStateMut;
 use openvm_circuit::{
     arch::{
-        AdapterAirContext, AdapterExecutorE1, AdapterTraceStep, BasicAdapterInterface,
-        ExecutionBridge, ExecutionState, ImmInstruction, VmAdapterAir,
+        execution_mode::E1E2ExecutionCtx, AdapterAirContext, AdapterExecutorE1, AdapterTraceStep,
+        BasicAdapterInterface, ExecutionBridge, ExecutionState, ImmInstruction, VmAdapterAir,
+        VmStateMut,
     },
     system::memory::{
         offline_checker::{MemoryBridge, MemoryReadOrImmediateAuxCols},

extensions/native/circuit/src/fri/tests.rs

@@ -15,12 +15,11 @@ use openvm_stark_backend::{
 use openvm_stark_sdk::{p3_baby_bear::BabyBear, utils::create_seeded_rng};
 use rand::Rng;
 
-use crate::fri::OVERALL_WIDTH;
-
 use super::{
     super::field_extension::FieldExtension, elem_to_ext, FriReducedOpeningAir,
     FriReducedOpeningChip, FriReducedOpeningStep, EXT_DEG,
 };
+use crate::fri::OVERALL_WIDTH;
 
 const MAX_INS_CAPACITY: usize = 1024;
 type F = BabyBear;
@@ -99,9 +98,9 @@ fn fri_mat_opening_air_test() {
         let address_space = 4usize;
 
         // tracing::debug!(
-        //     "{opcode:?} d = {}, e = {}, f = {}, result_addr = {}, addr1 = {}, addr2 = {}, z = {}, x = {}, y = {}",
-        //     result_as, as1, as2, result_pointer, address1, address2, result, operand1, operand2,
-        // );
+        //     "{opcode:?} d = {}, e = {}, f = {}, result_addr = {}, addr1 = {}, addr2 = {}, z = {},
+        // x = {}, y = {}",     result_as, as1, as2, result_pointer, address1, address2,
+        // result, operand1, operand2, );
 
         tester.write(address_space, alpha_pointer, alpha);
         tester.write(