Skip to content

Commit 2bac657

Browse files
authored
Update the log dependency (#11197)
* Update the `log` dependency This enables getting warnings about formatting strings in the `log` crate directives which are then additionally fixed here as well. * Update dependency directive in `Cargo.toml`
1 parent 838ed2d commit 2bac657

File tree

45 files changed

+92
-112
lines changed

Some content is hidden

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

45 files changed

+92
-112
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ addr2line = { version = "0.24.1", default-features = false }
351351
anyhow = { version = "1.0.93", default-features = false }
352352
windows-sys = "0.59.0"
353353
env_logger = "0.11.5"
354-
log = { version = "0.4.8", default-features = false }
354+
log = { version = "0.4.27", default-features = false }
355355
clap = { version = "4.5.17", default-features = false, features = ["std", "derive"] }
356356
clap_complete = "4.4.7"
357357
hashbrown = { version = "0.15", default-features = false }

cranelift/codegen/src/egraph.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,7 @@ where
198198

199199
self.available_block[result] = self.get_available_block(inst);
200200
let opt_value = self.optimize_pure_enode(inst);
201-
log::trace!(
202-
"optimizing inst {} orig result {} gave {}",
203-
inst,
204-
result,
205-
opt_value
206-
);
201+
log::trace!("optimizing inst {inst} orig result {result} gave {opt_value}");
207202

208203
let gvn_context = GVNContext {
209204
value_lists: &self.func.dfg.value_lists,

cranelift/codegen/src/isa/aarch64/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ impl TargetIsa for AArch64Backend {
8181
let dynamic_stackslot_offsets = emit_result.dynamic_stackslot_offsets;
8282

8383
if let Some(disasm) = emit_result.disasm.as_ref() {
84-
log::debug!("disassembly:\n{}", disasm);
84+
log::debug!("disassembly:\n{disasm}");
8585
}
8686

8787
Ok(CompiledCodeStencil {

cranelift/codegen/src/isa/pulley_shared/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ where
183183
let dynamic_stackslot_offsets = emit_result.dynamic_stackslot_offsets;
184184

185185
if let Some(disasm) = emit_result.disasm.as_ref() {
186-
log::debug!("disassembly:\n{}", disasm);
186+
log::debug!("disassembly:\n{disasm}");
187187
}
188188

189189
Ok(CompiledCodeStencil {

cranelift/codegen/src/isa/riscv64/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ impl TargetIsa for Riscv64Backend {
8080
let dynamic_stackslot_offsets = emit_result.dynamic_stackslot_offsets;
8181

8282
if let Some(disasm) = emit_result.disasm.as_ref() {
83-
log::debug!("disassembly:\n{}", disasm);
83+
log::debug!("disassembly:\n{disasm}");
8484
}
8585

8686
Ok(CompiledCodeStencil {

cranelift/codegen/src/isa/s390x/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ impl TargetIsa for S390xBackend {
8181
let dynamic_stackslot_offsets = emit_result.dynamic_stackslot_offsets;
8282

8383
if let Some(disasm) = emit_result.disasm.as_ref() {
84-
log::debug!("disassembly:\n{}", disasm);
84+
log::debug!("disassembly:\n{disasm}");
8585
}
8686

8787
Ok(CompiledCodeStencil {

cranelift/codegen/src/machinst/compile.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,7 @@ pub fn compile<B: LowerBackend + TargetIsa>(
7373
regalloc2::run(&vcode, vcode.abi.machine_env(), &options)
7474
.map_err(|err| {
7575
log::error!(
76-
"Register allocation error for vcode\n{:?}\nError: {:?}\nCLIF for error:\n{:?}",
77-
vcode,
78-
err,
79-
f,
76+
"Register allocation error for vcode\n{vcode:?}\nError: {err:?}\nCLIF for error:\n{f:?}",
8077
);
8178
err
8279
})
@@ -91,11 +88,7 @@ pub fn compile<B: LowerBackend + TargetIsa>(
9188
checker
9289
.run()
9390
.map_err(|err| {
94-
log::error!(
95-
"Register allocation checker errors:\n{:?}\nfor vcode:\n{:?}",
96-
err,
97-
vcode
98-
);
91+
log::error!("Register allocation checker errors:\n{err:?}\nfor vcode:\n{vcode:?}");
9992
err
10093
})
10194
.expect("register allocation checker");

cranelift/codegen/src/timing.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ mod enabled {
232232
impl Profiler for DefaultProfiler {
233233
fn start_pass(&self, pass: Pass) -> Box<dyn Any> {
234234
let prev = CURRENT_PASS.with(|p| p.replace(pass));
235-
log::debug!("timing: Starting {}, (during {})", pass, prev);
235+
log::debug!("timing: Starting {pass}, (during {prev})");
236236
Box::new(DefaultTimingToken {
237237
start: Instant::now(),
238238
pass,

cranelift/filetests/src/concurrent.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ fn worker_thread(
160160
});
161161

162162
if let Err(ref msg) = result {
163-
error!("FAIL: {}", msg);
163+
error!("FAIL: {msg}");
164164
}
165165

166166
replies.send(Reply::Done { jobid, result }).unwrap();

0 commit comments

Comments
 (0)