Skip to content

Commit 79d5f89

Browse files
TomWambsgansTomWambsgans
committed
clippy
1 parent f77f55c commit 79d5f89

File tree

12 files changed

+78
-85
lines changed

12 files changed

+78
-85
lines changed

‎Cargo.lock‎

Lines changed: 34 additions & 46 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "modular-precompiles"
2+
name = "lean-multisig"
33
version.workspace = true
44
edition.workspace = true
55

@@ -70,18 +70,18 @@ serde_json = "1.0.145"
7070
num_enum = "0.7.5"
7171
tracing-subscriber = { version = "0.3.19", features = ["std", "env-filter"] }
7272
tracing-forest = { version = "0.3.0", features = ["ansi", "smallvec"] }
73-
p3-koala-bear = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "modular-precompiles" }
74-
p3-baby-bear = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "modular-precompiles" }
75-
p3-poseidon2 = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "modular-precompiles" }
76-
p3-symmetric = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "modular-precompiles" }
77-
p3-air = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "modular-precompiles" }
78-
p3-goldilocks = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "modular-precompiles" }
79-
p3-challenger = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "modular-precompiles" }
80-
p3-util = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "modular-precompiles" }
81-
p3-monty-31 = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "modular-precompiles" }
73+
p3-koala-bear = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
74+
p3-baby-bear = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
75+
p3-poseidon2 = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
76+
p3-symmetric = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
77+
p3-air = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
78+
p3-goldilocks = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
79+
p3-challenger = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
80+
p3-util = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
81+
p3-monty-31 = { git = "https://github.com/TomWambsgans/Plonky3.git", branch = "lean-multisig" }
8282

83-
whir-p3 = { git = "https://github.com/TomWambsgans/whir-p3", branch = "modular-precompiles" }
84-
multilinear-toolkit = { git = "https://github.com/leanEthereum/multilinear-toolkit.git", branch = "modular-precompiles" }
83+
whir-p3 = { git = "https://github.com/TomWambsgans/whir-p3", branch = "lean-multisig" }
84+
multilinear-toolkit = { git = "https://github.com/leanEthereum/multilinear-toolkit.git" }
8585

8686
[dependencies]
8787
clap.workspace = true

‎crates/air/src/verify.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ use p3_util::log2_ceil_usize;
44

55
use crate::utils::next_mle;
66

7+
#[allow(clippy::type_complexity)]
8+
#[allow(clippy::too_many_arguments)]
79
pub fn verify_air<EF: ExtensionField<PF<EF>>, A: Air>(
810
verifier_state: &mut FSVerifier<EF, impl FSChallenger<EF>>,
911
air: &A,
@@ -105,6 +107,7 @@ where
105107
}
106108

107109
#[allow(clippy::too_many_arguments)] // TODO
110+
#[allow(clippy::type_complexity)]
108111
fn open_columns<EF: ExtensionField<PF<EF>>>(
109112
verifier_state: &mut FSVerifier<EF, impl FSChallenger<EF>>,
110113
n_columns_f: usize,

‎crates/lean_compiler/src/parser/parsers/function.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,10 @@ impl FunctionCallParser {
235235
}
236236
_ => {
237237
// Check for special precompile functions
238-
if let Some(table) = ALL_TABLES.into_iter().find(|p| p.name() == function_name) {
239-
if table != Table::execution() {
240-
return Ok(Line::Precompile { table, args });
241-
}
238+
if let Some(table) = ALL_TABLES.into_iter().find(|p| p.name() == function_name)
239+
&& table != Table::execution()
240+
{
241+
return Ok(Line::Precompile { table, args });
242242
}
243243

244244
// fall back to regular function call

‎crates/lean_prover/src/prove_execution.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ fn prove_bus_and_air(
538538
.chunks_exact(1 << UNIVARIATE_SKIPS)
539539
.map(|chunk| {
540540
evaluate_univariate_multilinear::<_, _, _, false>(
541-
&chunk,
541+
chunk,
542542
&[epsilon],
543543
&uni_selectors,
544544
None,
@@ -549,7 +549,7 @@ fn prove_bus_and_air(
549549
.chunks_exact(1 << UNIVARIATE_SKIPS)
550550
.map(|chunk| {
551551
evaluate_univariate_multilinear::<_, _, _, false>(
552-
&chunk,
552+
chunk,
553553
&[epsilon],
554554
&uni_selectors,
555555
None,
@@ -585,7 +585,7 @@ fn prove_bus_and_air(
585585

586586
let extra_data = ExtraDataForBuses {
587587
fingerprint_challenge_powers: powers_const(fingerprint_challenge),
588-
bus_beta: bus_beta,
588+
bus_beta,
589589
alpha_powers: vec![], // filled later
590590
};
591591
let (air_point, evals_f, evals_ef) =

‎crates/lean_prover/src/verify_execution.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ pub fn verify_execution(
264264
final_pc_statement,
265265
]);
266266

267-
let mut all_base_statements = vec![
267+
let mut all_base_statements = [
268268
vec![memory_statements],
269269
encapsulate_vec(p16_gkr.cubes_statements.split()),
270270
encapsulate_vec(p24_gkr.cubes_statements.split()),
@@ -302,6 +302,7 @@ pub fn verify_execution(
302302
Ok(())
303303
}
304304

305+
#[allow(clippy::type_complexity)]
305306
fn verify_bus_and_air(
306307
verifier_state: &mut VerifierState<PF<EF>, EF, impl FSChallenger<EF>>,
307308
t: &Table,
@@ -363,7 +364,7 @@ fn verify_bus_and_air(
363364
.chunks_exact(1 << UNIVARIATE_SKIPS)
364365
.map(|chunk| {
365366
evaluate_univariate_multilinear::<_, _, _, false>(
366-
&chunk,
367+
chunk,
367368
&[epsilon],
368369
&uni_selectors,
369370
None,
@@ -374,7 +375,7 @@ fn verify_bus_and_air(
374375
.chunks_exact(1 << UNIVARIATE_SKIPS)
375376
.map(|chunk| {
376377
evaluate_univariate_multilinear::<_, _, _, false>(
377-
&chunk,
378+
chunk,
378379
&[epsilon],
379380
&uni_selectors,
380381
None,

0 commit comments

Comments
 (0)