diff options
| author | Ralf Jung <post@ralfj.de> | 2022-07-02 13:37:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-02 13:37:24 -0400 |
| commit | 0832d1d02280e17cfa083b068d2def4b1844cd10 (patch) | |
| tree | 8d805116f34c80b46bdd7e831582ca3433c036e4 | |
| parent | d31cbb51505f4ca8c25b1b11abe3d10ad8171b06 (diff) | |
| download | rust-0832d1d02280e17cfa083b068d2def4b1844cd10.tar.gz rust-0832d1d02280e17cfa083b068d2def4b1844cd10.zip | |
more use of format! variable capture
Co-authored-by: Joe ST <joe@fbstj.net>
| -rw-r--r-- | compiler/rustc_const_eval/src/interpret/memory.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_middle/src/mir/interpret/error.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_middle/src/mir/interpret/mod.rs | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/compiler/rustc_const_eval/src/interpret/memory.rs b/compiler/rustc_const_eval/src/interpret/memory.rs index de6200ef012..86d5bb37d55 100644 --- a/compiler/rustc_const_eval/src/interpret/memory.rs +++ b/compiler/rustc_const_eval/src/interpret/memory.rs @@ -306,9 +306,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> { } if alloc_kind != kind { throw_ub_format!( - "deallocating {alloc_id:?}, which is {} memory, using {} deallocation operation", - alloc_kind, - kind + "deallocating {alloc_id:?}, which is {alloc_kind} memory, using {kind} deallocation operation" ); } if let Some((size, align)) = old_size_and_align { diff --git a/compiler/rustc_middle/src/mir/interpret/error.rs b/compiler/rustc_middle/src/mir/interpret/error.rs index dbdbeb0830a..f30769248c0 100644 --- a/compiler/rustc_middle/src/mir/interpret/error.rs +++ b/compiler/rustc_middle/src/mir/interpret/error.rs @@ -357,7 +357,7 @@ impl fmt::Display for UndefinedBehaviorInfo<'_> { write!(f, "{msg}null pointer is not a valid pointer") } DanglingIntPointer(i, msg) => { - write!(f, "{msg}{:#x} is not a valid pointer", i) + write!(f, "{msg}{i:#x} is not a valid pointer") } AlignmentCheckFailed { required, has } => write!( f, diff --git a/compiler/rustc_middle/src/mir/interpret/mod.rs b/compiler/rustc_middle/src/mir/interpret/mod.rs index 8b754832527..698024b2330 100644 --- a/compiler/rustc_middle/src/mir/interpret/mod.rs +++ b/compiler/rustc_middle/src/mir/interpret/mod.rs @@ -466,7 +466,7 @@ impl<'tcx> TyCtxt<'tcx> { return alloc_id; } let id = alloc_map.reserve(); - debug!("creating alloc {:?} with id {:?}", alloc, id); + debug!("creating alloc {alloc:?} with id {id:?}"); alloc_map.alloc_map.insert(id, alloc.clone()); alloc_map.dedup.insert(alloc, id); id |