more use of format! variable capture

Co-authored-by: Joe ST <joe@fbstj.net>
This commit is contained in:
Ralf Jung
2022-07-02 13:37:24 -04:00
committed by GitHub
parent d31cbb5150
commit 0832d1d022
3 changed files with 3 additions and 5 deletions
@@ -306,9 +306,7 @@ pub fn deallocate_ptr(
}
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 {
@@ -357,7 +357,7 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
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,
@@ -466,7 +466,7 @@ fn reserve_and_set_dedup(self, alloc: GlobalAlloc<'tcx>) -> AllocId {
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