Skip to content

Commit 52600f1

Browse files
committed
Merge branch 'fix-more-clippy' into fix-cache
2 parents cddf9ed + 8630912 commit 52600f1

File tree

4 files changed

+6
-18
lines changed

4 files changed

+6
-18
lines changed

executor/src/witgen/machines/double_sorted_witness_machine_16.rs

+2-6
Original file line numberDiff line numberDiff line change
@@ -486,9 +486,7 @@ impl<'a, T: FieldElement> DoubleSortedWitnesses16<'a, T> {
486486

487487
let value_int: u64 = value.into();
488488

489-
log::trace!(
490-
"Memory write: addr=0x{addr_int:x}, step={step}, value=0x{value_int:x}"
491-
);
489+
log::trace!("Memory write: addr=0x{addr_int:x}, step={step}, value=0x{value_int:x}");
492490
self.data.insert(addr_int, value_int);
493491
self.trace
494492
.insert(
@@ -503,9 +501,7 @@ impl<'a, T: FieldElement> DoubleSortedWitnesses16<'a, T> {
503501
.is_none()
504502
} else {
505503
let value = self.data.entry(addr_int).or_default();
506-
log::trace!(
507-
"Memory read: addr=0x{addr_int:x}, step={step}, value=0x{value:x}"
508-
);
504+
log::trace!("Memory read: addr=0x{addr_int:x}, step={step}, value=0x{value:x}");
509505

510506
let value_int: u64 = *value;
511507
let value_low = value_int & 0xffff;

executor/src/witgen/machines/double_sorted_witness_machine_32.rs

+2-6
Original file line numberDiff line numberDiff line change
@@ -461,9 +461,7 @@ impl<T: FieldElement> DoubleSortedWitnesses32<'_, T> {
461461
LookupCell::Output(_) => return Ok(false),
462462
};
463463

464-
log::trace!(
465-
"Memory write: addr={addr:x}, step={step}, value={value:x}"
466-
);
464+
log::trace!("Memory write: addr={addr:x}, step={step}, value={value:x}");
467465
self.data.write(*addr, *value);
468466
self.trace
469467
.insert(
@@ -478,9 +476,7 @@ impl<T: FieldElement> DoubleSortedWitnesses32<'_, T> {
478476
.is_none()
479477
} else {
480478
let value = self.data.read(*addr);
481-
log::trace!(
482-
"Memory read: addr={addr:x}, step={step}, value={value:x}"
483-
);
479+
log::trace!("Memory read: addr={addr:x}, step={step}, value={value:x}");
484480
match value_ptr {
485481
LookupCell::Input(v) => {
486482
if *v != &value {

riscv-executor/src/submachines.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,7 @@ impl<F: FieldElement, M: SubmachineKind> SubmachineImpl<F, M> {
134134
.collect();
135135
let cols = M::cols();
136136
if witness_cols.is_empty() {
137-
log::info!(
138-
"namespace {namespace} has no witness columns in the optimized pil"
139-
);
137+
log::info!("namespace {namespace} has no witness columns in the optimized pil");
140138
}
141139
SubmachineImpl {
142140
trace: SubmachineTrace::new(namespace, cols, selectors),

riscv/src/continuations.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -675,9 +675,7 @@ pub fn rust_continuations_dry_run<F: FieldElement>(
675675

676676
let remaining_rows = full_trace_length - proven_trace;
677677
let remaining_chunks = (remaining_rows as f32 / avg_rows_per_chunk as f32).ceil() as usize;
678-
log::info!(
679-
" => Estimating {remaining_chunks} more chunks at the current ratio"
680-
);
678+
log::info!(" => Estimating {remaining_chunks} more chunks at the current ratio");
681679

682680
chunk_index += 1;
683681
}

0 commit comments

Comments
 (0)