Skip to content

Commit 697737a

Browse files
Enseliclukas-codecuviper
committed
core: Make Debug impl of raw pointers print metadata if present
Make Rust pointers less magic by including metadata information in their `Debug` output. This does not break Rust stability guarantees because `Debug` output is explicitly exempted from stability: https://doc.rust-lang.org/std/fmt/trait.Debug.html#stability Co-authored-by: Lukas <26522220+lukas-code@users.noreply.github.com> Co-authored-by: Josh Stone <cuviper@gmail.com>
1 parent d16da3b commit 697737a

File tree

3 files changed

+28
-5
lines changed

3 files changed

+28
-5
lines changed

library/core/src/fmt/mod.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -2776,7 +2776,14 @@ impl Display for char {
27762776
#[stable(feature = "rust1", since = "1.0.0")]
27772777
impl<T: ?Sized> Pointer for *const T {
27782778
fn fmt(&self, f: &mut Formatter<'_>) -> Result {
2779-
pointer_fmt_inner(self.expose_provenance(), f)
2779+
if <<T as core::ptr::Pointee>::Metadata as core::unit::IsUnit>::is_unit() {
2780+
pointer_fmt_inner(self.expose_provenance(), f)
2781+
} else {
2782+
f.debug_struct("Pointer")
2783+
.field_with("addr", |f| pointer_fmt_inner(self.expose_provenance(), f))
2784+
.field("metadata", &core::ptr::metadata(*self))
2785+
.finish()
2786+
}
27802787
}
27812788
}
27822789

library/core/src/unit.rs

+16
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,19 @@ impl FromIterator<()> for () {
1717
iter.into_iter().for_each(|()| {})
1818
}
1919
}
20+
21+
pub(crate) trait IsUnit {
22+
fn is_unit() -> bool;
23+
}
24+
25+
impl<T: ?Sized> IsUnit for T {
26+
default fn is_unit() -> bool {
27+
false
28+
}
29+
}
30+
31+
impl IsUnit for () {
32+
fn is_unit() -> bool {
33+
true
34+
}
35+
}

library/coretests/tests/fmt/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ fn test_fmt_debug_of_raw_pointers() {
4242
check_fmt(plain as *const i32, "$HEX");
4343

4444
let slice = &mut [200, 300, 400][..];
45-
check_fmt(slice as *mut [i32], "$HEX");
46-
check_fmt(slice as *const [i32], "$HEX");
45+
check_fmt(slice as *mut [i32], "Pointer { addr: $HEX, metadata: 3 }");
46+
check_fmt(slice as *const [i32], "Pointer { addr: $HEX, metadata: 3 }");
4747

4848
let vtable = &mut 500 as &mut dyn Debug;
49-
check_fmt(vtable as *mut dyn Debug, "$HEX");
50-
check_fmt(vtable as *const dyn Debug, "$HEX");
49+
check_fmt(vtable as *mut dyn Debug, "Pointer { addr: $HEX, metadata: DynMetadata($HEX) }");
50+
check_fmt(vtable as *const dyn Debug, "Pointer { addr: $HEX, metadata: DynMetadata($HEX) }");
5151
}
5252

5353
#[test]

0 commit comments

Comments
 (0)