Skip to content

Commit 719deea

Browse files
committed
fix clippy
1 parent bc1e6f4 commit 719deea

File tree

5 files changed

+15
-22
lines changed

5 files changed

+15
-22
lines changed

circuit/src/ops/mmcs.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,8 @@ impl<F: Field> NonPrimitiveExecutor<F> for MmcsVerifyExecutor {
390390
return Err(CircuitError::IncorrectNonPrimitiveOpPrivateData {
391391
op: self.op_type.clone(),
392392
operation_index: ctx.operation_id(),
393-
expected: alloc::format!("root: {:?}", private_data_root),
394-
got: alloc::format!("root: existing witness value at {:?}", wid),
393+
expected: alloc::format!("root: {private_data_root:?}"),
394+
got: alloc::format!("root: existing witness value at {wid:?}"),
395395
});
396396
}
397397
}

circuit/src/tables/mmcs.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,9 +297,7 @@ impl<'a, F: CircuitField> MmcsTraceBuilder<'a, F> {
297297
.ok_or(CircuitError::NonPrimitiveOpMissingPrivateData {
298298
operation_index: *op_id,
299299
})?;
300-
let priv_data = match private_data {
301-
NonPrimitiveOpPrivateData::MmcsVerify(d) => d,
302-
};
300+
let NonPrimitiveOpPrivateData::MmcsVerify(priv_data) = private_data;
303301

304302
let trace = priv_data.to_trace(config, leaf, root)?;
305303
mmcs_paths.push(trace);

circuit/src/tables/runner.rs

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,20 +72,17 @@ impl<F: CircuitField> CircuitRunner<F> {
7272
}
7373

7474
// Validate that the private data matches the operation type (if any)
75-
match &self.circuit.non_primitive_ops[op_id.0 as usize] {
76-
Op::NonPrimitiveOpWithExecutor { executor, .. } => {
77-
match (executor.op_type(), &private_data) {
78-
(
79-
crate::op::NonPrimitiveOpType::MmcsVerify,
80-
NonPrimitiveOpPrivateData::MmcsVerify(_),
81-
) => {
82-
// ok
83-
}
84-
// Other ops currently don't expect private data
85-
_ => {}
86-
}
75+
if let Op::NonPrimitiveOpWithExecutor { executor, .. } =
76+
&self.circuit.non_primitive_ops[op_id.0 as usize]
77+
{
78+
if let (
79+
crate::op::NonPrimitiveOpType::MmcsVerify,
80+
NonPrimitiveOpPrivateData::MmcsVerify(_),
81+
) = (executor.op_type(), &private_data)
82+
{
83+
// ok
8784
}
88-
_ => {}
85+
// Other ops currently don't expect private data
8986
}
9087

9188
// Store private data for this operation

recursion/src/circuit_fri_verifier.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -517,8 +517,7 @@ pub fn verify_fri_circuit<F, EF, RecMmcs, Inner, Witness, Comm>(
517517

518518
assert_eq!(
519519
actual_final_poly_len, expected_final_poly_len,
520-
"Final polynomial length mismatch: expected 2^{} = {}, got {}",
521-
log_final_poly_len, expected_final_poly_len, actual_final_poly_len
520+
"Final polynomial length mismatch: expected 2^{log_final_poly_len} = {expected_final_poly_len}, got {actual_final_poly_len}"
522521
);
523522

524523
// Precompute two-adic generator ladders for each phase (in circuit field EF).

recursion/tests/fri.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,7 @@ fn run_fri_test(setup: FriSetup, build_only: bool) {
411411
assert_eq!(
412412
fri_targets.final_poly.len(),
413413
expected_final_poly_len,
414-
"Circuit final polynomial should have {} coefficients",
415-
expected_final_poly_len
414+
"Circuit final polynomial should have {expected_final_poly_len} coefficients"
416415
);
417416

418417
// 2) Public inputs for α, βs, index bits

0 commit comments

Comments
 (0)