Skip to content

Commit 0ed9db7

Browse files
lvellalvella
authored
Fix lint on log calls. (#2589)
Log crate now has clippy enabled for its arguments
1 parent c29d226 commit 0ed9db7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+81
-102
lines changed

‎analysis/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ powdr-parser.workspace = true
1515

1616
itertools = "0.13"
1717
lazy_static = "1.4.0"
18-
log = "0.4.18"
18+
log = "0.4.27"
1919

2020
[dev-dependencies]
2121
powdr-importer.workspace = true

‎asm-to-pil/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ powdr-parser.workspace = true
1414
powdr-parser-util.workspace = true
1515

1616
lazy_static = "1.4.0"
17-
log = "0.4.17"
17+
log = "0.4.27"
1818
pretty_assertions = "1.4.0"
1919

2020
[dev-dependencies]
@@ -25,4 +25,4 @@ powdr-importer = { path = "../importer" }
2525
workspace = true
2626

2727
[lib]
28-
bench = false # See https://github.com/bheisler/criterion.rs/issues/458
28+
bench = false # See https://github.com/bheisler/criterion.rs/issues/458

‎backend-utils/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ powdr-parser.workspace = true
1212
powdr-ast.workspace = true
1313
powdr-number.workspace = true
1414
powdr-executor-utils.workspace = true
15-
log = "0.4.22"
15+
log = "0.4.27"
1616
itertools = "0.13.0"
1717

1818
[lib]

‎backend/Cargo.toml

+4-2
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,12 @@ p3-commit = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf2
6363
], optional = true }
6464
p3-matrix = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0", optional = true }
6565
p3-uni-stark = { git = "https://github.com/plonky3/Plonky3.git", rev = "2192432ddf28e7359dd2c577447886463e6124f0", optional = true }
66-
stwo-prover = { git = "https://github.com/starkware-libs/stwo.git", optional = true, rev = "81d1fe349b490089f65723ad49ef72b9d09495ba",features = ["parallel"] }
66+
stwo-prover = { git = "https://github.com/starkware-libs/stwo.git", optional = true, rev = "81d1fe349b490089f65723ad49ef72b9d09495ba", features = [
67+
"parallel",
68+
] }
6769

6870
strum = { version = "0.24.1", features = ["derive"] }
69-
log = "0.4.17"
71+
log = "0.4.27"
7072
tracing = "0.1.37"
7173
serde = "1.0"
7274
serde_json = "1.0"

‎backend/src/composite/mod.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -192,14 +192,14 @@ fn log_machine_stats<T: FieldElement>(machine_name: &str, pil: &Analyzed<T>) {
192192
.into_iter()
193193
.collect::<BTreeMap<_, _>>();
194194

195-
log::info!("* {}:", machine_name);
196-
log::info!(" * Number of witness columns: {}", num_witness_columns);
197-
log::info!(" * Number of fixed columns: {}", num_fixed_columns);
198-
log::info!(" * Maximum identity degree: {}", max_identity_degree);
199-
log::info!(" * Number of rotations: {}", number_of_rotations);
195+
log::info!("* {machine_name}:");
196+
log::info!(" * Number of witness columns: {num_witness_columns}");
197+
log::info!(" * Number of fixed columns: {num_fixed_columns}");
198+
log::info!(" * Maximum identity degree: {max_identity_degree}");
199+
log::info!(" * Number of rotations: {number_of_rotations}");
200200
log::info!(" * Number of identities:");
201201
for (kind, count) in num_identities_by_kind {
202-
log::info!(" * {:?}: {}", kind, count);
202+
log::info!(" * {kind:?}: {count}");
203203
}
204204
}
205205

@@ -414,7 +414,7 @@ impl<F: FieldElement> Backend<F> for CompositeBackend<F> {
414414
.map(|(machine_name, (proof, size))| match proof {
415415
Ok(proof) => Ok((machine_name.clone(), MachineProof { size, proof })),
416416
Err(e) => {
417-
log::error!("==> Machine proof failed: {:?}", e);
417+
log::error!("==> Machine proof failed: {e:?}");
418418
Err(e)
419419
}
420420
})

‎backend/src/estark/starky_wrapper.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ impl EStark {
174174

175175
let duration = start.elapsed();
176176

177-
log::info!("Proof done in: {:?}", duration);
177+
log::info!("Proof done in: {duration:?}");
178178

179179
match self.verify_stark_gl(&starkproof) {
180180
Ok(_) => Ok(serde_json::to_string(&starkproof).unwrap().into_bytes()),

‎backend/src/halo2/prover.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ impl Halo2Prover {
147147
let proof = gen_proof::<_, _, TW>(&self.params, &pk, circuit, &publics)?;
148148

149149
let duration = start.elapsed();
150-
log::info!("Time taken: {:?}", duration);
150+
log::info!("Time taken: {duration:?}");
151151

152152
match self.verify_inner::<_, TR>(&vk, &self.params, &proof, &publics) {
153153
Ok(_) => {}
@@ -290,7 +290,7 @@ impl Halo2Prover {
290290
&agg_instances,
291291
)?;
292292
let duration = start.elapsed();
293-
log::info!("Time taken: {:?}", duration);
293+
log::info!("Time taken: {duration:?}");
294294

295295
match self.verify_inner::<_, EvmTranscript<G1Affine, _, _, _>>(
296296
&vk_aggr,

‎backend/src/mock/bus_checker.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ impl<'a, F: FieldElement> BusChecker<'a, F> {
187187
receives: receives.into_iter().map(|(k, v)| (k.clone(), v)).collect(),
188188
};
189189

190-
log::error!("{}", error);
190+
log::error!("{error}");
191191

192192
errors.push(error);
193193
}

‎backend/src/mock/connection_constraint_checker.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ impl<'a, F: FieldElement> ConnectionConstraintChecker<'a, F> {
165165
connection_count: self.connections.len(),
166166
errors,
167167
};
168-
log::error!("{}", error);
168+
log::error!("{error}");
169169
Err(error)
170170
})
171171
.unwrap_or(Ok(()))

‎backend/src/mock/polynomial_constraint_checker.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ impl<F: fmt::Display> MachineResult<'_, F> {
121121

122122
for error in self.errors.iter().take(MAX_ERRORS) {
123123
let error_indented = error.to_string().replace("\n", "\n ");
124-
log::error!(" Error: {}", error_indented);
124+
log::error!(" Error: {error_indented}");
125125
}
126126
if num_errors > MAX_ERRORS {
127127
log::error!(" ... and {} more errors", num_errors - MAX_ERRORS);

‎cli-rs/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ powdr.workspace = true
2020

2121
clap = { version = "^4.3", features = ["derive"] }
2222
env_logger = "0.10.0"
23-
log = "0.4.17"
23+
log = "0.4.27"
2424
strum = { version = "0.24.1", features = ["derive"] }
2525
clap-markdown = "0.1.3"
2626

2727
[[bin]]
2828
name = "powdr-rs"
2929
path = "src/main.rs"
30-
bench = false # See https://github.com/bheisler/criterion.rs/issues/458
30+
bench = false # See https://github.com/bheisler/criterion.rs/issues/458

‎cli/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ powdr.workspace = true
2525
clap = { version = "^4.3", features = ["derive"] }
2626
env_logger = "0.10.0"
2727
itertools = "0.13"
28-
log = "0.4.17"
28+
log = "0.4.27"
2929
strum = { version = "0.24.1", features = ["derive"] }
3030
clap-markdown = "0.1.3"
3131
tracing = "0.1.37"
@@ -43,7 +43,7 @@ env_logger = "0.10.0"
4343
[[bin]]
4444
name = "powdr"
4545
path = "src/main.rs"
46-
bench = false # See https://github.com/bheisler/criterion.rs/issues/458
46+
bench = false # See https://github.com/bheisler/criterion.rs/issues/458
4747

4848
[lints.clippy]
4949
uninlined_format_args = "deny"

‎examples/fibonacci/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ powdr = { git = "https://github.com/powdr-labs/powdr", tag = "v0.1.3", features
1313
] }
1414

1515
env_logger = "0.10.2"
16-
log = "0.4.17"
16+
log = "0.4.27"
1717

1818
[workspace]

‎examples/keccak/Cargo.toml

+4-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ default = []
88
simd = ["powdr/plonky3-simd"]
99

1010
[dependencies]
11-
powdr = { git = "https://github.com/powdr-labs/powdr", tag = "v0.1.3", features = ["plonky3"] }
11+
powdr = { git = "https://github.com/powdr-labs/powdr", tag = "v0.1.3", features = [
12+
"plonky3",
13+
] }
1214
hex = "0.4"
1315

1416
env_logger = "0.10.2"
15-
log = "0.4.17"
17+
log = "0.4.27"
1618

1719
[workspace]

‎executor/Cargo.toml

+6-2
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,18 @@ powdr-jit-compiler.workspace = true
1818
auto_enums = "0.8.5"
1919
itertools = "0.13"
2020
libloading = "0.8"
21-
log = { version = "0.4.17" }
21+
log = "0.4.27"
2222
rayon = "1.7.0"
2323
bit-vec = "0.6.3"
2424
num-traits = "0.2.15"
2525
derive_more = "0.99.17"
2626
lazy_static = "1.4.0"
2727
indicatif = "0.17.7"
28-
serde = { version = "1.0", default-features = false, features = ["alloc", "derive", "rc"] }
28+
serde = { version = "1.0", default-features = false, features = [
29+
"alloc",
30+
"derive",
31+
"rc",
32+
] }
2933

3034
[dev-dependencies]
3135
test-log = "0.2.12"

‎executor/src/constant_evaluator/jit_compiler.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pub fn generate_values<T: FieldElement>(
1515
let compiled_pil = match powdr_jit_compiler::compile(analyzed, &symbols_to_compile(analyzed)) {
1616
Err(err) => {
1717
// TODO this should be changed back to Error after the introduction of the ToCol trait.
18-
log::debug!("Failed to compile some constant columns: {}", err);
18+
log::debug!("Failed to compile some constant columns: {err}");
1919
return HashMap::new();
2020
}
2121
Ok(fun_map) => fun_map,

‎executor/src/constant_evaluator/mod.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@ pub fn generate<T: FieldElement>(analyzed: &Analyzed<T>) -> Vec<(String, Variabl
4949
};
5050
log::log!(
5151
log_level,
52-
" Generated values for {} ({}) in {:.2}s",
53-
name,
54-
range,
55-
time
52+
" Generated values for {name} ({range}) in {time:.2}s"
5653
);
5754
column
5855
});

‎executor/src/witgen/machines/block_machine.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ impl<'a, T: FieldElement> BlockMachine<'a, T> {
449449
log::trace!("Left values of lookup:");
450450
if log::log_enabled!(log::Level::Trace) {
451451
for l in arguments {
452-
log::trace!(" {}", l);
452+
log::trace!(" {l}");
453453
}
454454
}
455455

‎executor/src/witgen/machines/double_sorted_witness_machine_16.rs

+3-14
Original file line numberDiff line numberDiff line change
@@ -469,10 +469,7 @@ impl<'a, T: FieldElement> DoubleSortedWitnesses16<'a, T> {
469469
let value2_expr = &arguments[5];
470470

471471
log::trace!(
472-
"Query addr=0x{:x}, step={step}, write: {is_write}, value: ({} {})",
473-
addr_int,
474-
value1_expr,
475-
value2_expr
472+
"Query addr=0x{addr_int:x}, step={step}, write: {is_write}, value: ({value1_expr} {value2_expr})"
476473
);
477474

478475
// TODO this does not check any of the failure modes
@@ -489,11 +486,7 @@ impl<'a, T: FieldElement> DoubleSortedWitnesses16<'a, T> {
489486

490487
let value_int: u64 = value.into();
491488

492-
log::trace!(
493-
"Memory write: addr=0x{:x}, step={step}, value=0x{:x}",
494-
addr_int,
495-
value_int
496-
);
489+
log::trace!("Memory write: addr=0x{addr_int:x}, step={step}, value=0x{value_int:x}");
497490
self.data.insert(addr_int, value_int);
498491
self.trace
499492
.insert(
@@ -508,11 +501,7 @@ impl<'a, T: FieldElement> DoubleSortedWitnesses16<'a, T> {
508501
.is_none()
509502
} else {
510503
let value = self.data.entry(addr_int).or_default();
511-
log::trace!(
512-
"Memory read: addr=0x{:x}, step={step}, value=0x{:x}",
513-
addr_int,
514-
value
515-
);
504+
log::trace!("Memory read: addr=0x{addr_int:x}, step={step}, value=0x{value:x}");
516505

517506
let value_int: u64 = *value;
518507
let value_low = value_int & 0xffff;

‎executor/src/witgen/machines/double_sorted_witness_machine_32.rs

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

464-
log::trace!(
465-
"Memory write: addr={:x}, step={step}, value={:x}",
466-
addr,
467-
value
468-
);
464+
log::trace!("Memory write: addr={addr:x}, step={step}, value={value:x}");
469465
self.data.write(*addr, *value);
470466
self.trace
471467
.insert(
@@ -480,11 +476,7 @@ impl<T: FieldElement> DoubleSortedWitnesses32<'_, T> {
480476
.is_none()
481477
} else {
482478
let value = self.data.read(*addr);
483-
log::trace!(
484-
"Memory read: addr={:x}, step={step}, value={:x}",
485-
addr,
486-
value
487-
);
479+
log::trace!("Memory read: addr={addr:x}, step={step}, value={value:x}");
488480
match value_ptr {
489481
LookupCell::Input(v) => {
490482
if *v != &value {

‎executor/src/witgen/machines/profiling.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ pub fn reset_and_print_profile_summary() {
115115
);
116116
}
117117
log::debug!(" ---------------------------");
118-
log::debug!(" ==> Total: {:?}", total_time);
118+
log::debug!(" ==> Total: {total_time:?}");
119119
log::debug!("\n");
120120
});
121121
}

‎executor/src/witgen/machines/write_once_memory.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ impl<'a, T: FieldElement> WriteOnceMemory<'a, T> {
163163
.map(|v| v.constant_value())
164164
.collect::<Vec<_>>();
165165

166-
log::trace!("Key: {:?}", key);
167-
log::trace!("Value: {:?}", value);
166+
log::trace!("Key: {key:?}");
167+
log::trace!("Value: {value:?}");
168168

169169
let Some(key) = key else {
170170
return Ok(EvalValue::incomplete(

‎executor/src/witgen/processor.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ impl<'a, 'c, T: FieldElement, Q: QueryCallback<T>> Processor<'a, 'c, T, Q> {
168168
{
169169
if let Some(right_poly) = try_to_simple_poly(r).map(|p| p.poly_id) {
170170
if let Some(l) = l.constant_value() {
171-
log::trace!(" {} = {}", r, l);
171+
log::trace!(" {r} = {l}");
172172
inputs.push((right_poly, l));
173173
}
174174
}
@@ -361,7 +361,7 @@ Known values in current row (local: {row_index}, global {global_row_index}):
361361
.zip(receive_payload.expressions.iter())
362362
{
363363
if let Ok(r) = row_pair.evaluate(r) {
364-
log::warn!(" => {} = {}", l, r);
364+
log::warn!(" => {l} = {r}");
365365
}
366366
}
367367
e
@@ -463,7 +463,7 @@ Known values in current row (local: {row_index}, global {global_row_index}):
463463
AlgebraicVariable::Public(name) => {
464464
if let Constraint::Assignment(v) = c {
465465
// There should be only few publics, so this can be logged with info.
466-
log::info!(" => {} (public) = {}", name, v);
466+
log::info!(" => {name} (public) = {v}");
467467
assert!(
468468
self.publics.insert(name, *v).is_none(),
469469
"value was already set!"
@@ -480,7 +480,7 @@ Known values in current row (local: {row_index}, global {global_row_index}):
480480
self.propagate_along_copy_constraints(row_index, poly, c);
481481
} else if let Constraint::Assignment(v) = c {
482482
let left = &mut self.outer_query.as_mut().unwrap().arguments;
483-
log::trace!(" => {} (outer) = {}", poly, v);
483+
log::trace!(" => {poly} (outer) = {v}");
484484
for l in left.iter_mut() {
485485
l.assign(*var, *v);
486486
}
@@ -633,7 +633,7 @@ Known values in current row (local: {row_index}, global {global_row_index}):
633633
"Proposed {:?}",
634634
proposed_row.render_values(true, self.parts)
635635
);
636-
log::trace!("Failed on identity: {}", identity);
636+
log::trace!("Failed on identity: {identity}");
637637

638638
return false;
639639
}

‎executor/src/witgen/rows.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ impl<T: FieldElement> CellValue<T> {
157157
(CellValue::RangeConstraint(current), Constraint::RangeConstraint(c)) => {
158158
let new = c.conjunction(current);
159159
assert!(new != *current, "Range constraint was already set");
160-
log::trace!(" (the conjunction is {})", new);
160+
log::trace!(" (the conjunction is {new})");
161161
*self = CellValue::RangeConstraint(new)
162162
}
163163
(CellValue::Unknown, Constraint::RangeConstraint(c)) => {

‎jit-compiler/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ powdr-ast.workspace = true
1212
powdr-number.workspace = true
1313
powdr-parser.workspace = true
1414

15-
log = "0.4.18"
15+
log = "0.4.27"
1616
mktemp = "0.5.0"
1717
itertools = "0.13"
1818
libloading = "0.8"

‎linker/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ strum = { version = "0.24.1", features = ["derive"] }
1717
pretty_assertions = "1.4.0"
1818
itertools = "0.13"
1919
lazy_static = "1.4.0"
20-
log = "0.4.22"
20+
log = "0.4.27"
2121
ibig = { version = "0.3.6", default-features = false }
2222

2323
[dev-dependencies]

0 commit comments

Comments
 (0)