From e00eac8b9c4af0bd6baa4b645773fdfa86829fcb Mon Sep 17 00:00:00 2001 From: Eliza Weisman Date: Thu, 7 Oct 2021 10:48:48 -0700 Subject: use structured fields in some existing warnings Signed-off-by: Eliza Weisman --- compiler/rustc_codegen_ssa/src/back/link.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'compiler/rustc_codegen_ssa/src') diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index ed15b464872..19eff1a3a3c 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -844,8 +844,8 @@ fn link_natively<'a, B: ArchiveBuilder<'a>>( if out.contains(msg_segv) || out.contains(msg_bus) { warn!( "looks like the linker segfaulted when we tried to call it, \ - automatically retrying again. cmd = {:?}, out = {}.", - cmd, out, + automatically retrying again", + ?cmd, %out, ); continue; } @@ -853,9 +853,8 @@ fn link_natively<'a, B: ArchiveBuilder<'a>>( if is_illegal_instruction(&output.status) { warn!( "looks like the linker hit an illegal instruction when we \ - tried to call it, automatically retrying again. cmd = {:?}, ]\ - out = {}, status = {}.", - cmd, out, output.status, + tried to call it, automatically retrying again." + ?cmd, %out, status = %output.status, ); continue; } -- cgit 1.4.1-3-g733a5 From b6f09a19b2345a6a898d176570496dea44b06aac Mon Sep 17 00:00:00 2001 From: Eliza Weisman Date: Thu, 7 Oct 2021 11:29:47 -0700 Subject: comma-related changes Signed-off-by: Eliza Weisman --- compiler/rustc_codegen_ssa/src/back/link.rs | 2 +- compiler/rustc_mir_dataflow/src/rustc_peek.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'compiler/rustc_codegen_ssa/src') diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index 19eff1a3a3c..b5429064324 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -853,7 +853,7 @@ fn link_natively<'a, B: ArchiveBuilder<'a>>( if is_illegal_instruction(&output.status) { warn!( "looks like the linker hit an illegal instruction when we \ - tried to call it, automatically retrying again." + tried to call it, automatically retrying again.", ?cmd, %out, status = %output.status, ); continue; diff --git a/compiler/rustc_mir_dataflow/src/rustc_peek.rs b/compiler/rustc_mir_dataflow/src/rustc_peek.rs index ee8fca961f6..c0bf4b659aa 100644 --- a/compiler/rustc_mir_dataflow/src/rustc_peek.rs +++ b/compiler/rustc_mir_dataflow/src/rustc_peek.rs @@ -289,7 +289,7 @@ impl<'tcx> RustcPeekAt<'tcx> for MaybeMutBorrowedLocals<'_, 'tcx> { flow_state: &BitSet, call: PeekCall, ) { - info!(?place, "peek_at",); + info!(?place, "peek_at"); let local = if let Some(l) = place.as_local() { l } else { -- cgit 1.4.1-3-g733a5 From 0e79545c306ca173fc406b61a81ea4e14400d293 Mon Sep 17 00:00:00 2001 From: Eliza Weisman Date: Thu, 7 Oct 2021 12:03:15 -0700 Subject: lol i forgot the syntax for my own crate's macros T_____T Signed-off-by: Eliza Weisman --- compiler/rustc_codegen_ssa/src/back/link.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'compiler/rustc_codegen_ssa/src') diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index b5429064324..fd59bdca133 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -843,18 +843,18 @@ fn link_natively<'a, B: ArchiveBuilder<'a>>( let msg_bus = "clang: error: unable to execute command: Bus error: 10"; if out.contains(msg_segv) || out.contains(msg_bus) { warn!( + ?cmd, %out, "looks like the linker segfaulted when we tried to call it, \ automatically retrying again", - ?cmd, %out, ); continue; } if is_illegal_instruction(&output.status) { warn!( + ?cmd, %out, status = %output.status, "looks like the linker hit an illegal instruction when we \ tried to call it, automatically retrying again.", - ?cmd, %out, status = %output.status, ); continue; } -- cgit 1.4.1-3-g733a5