File tree 2 files changed +12
-5
lines changed
2 files changed +12
-5
lines changed Original file line number Diff line number Diff line change @@ -2767,7 +2767,14 @@ impl Display for char {
2767
2767
#[ stable( feature = "rust1" , since = "1.0.0" ) ]
2768
2768
impl < T : ?Sized > Pointer for * const T {
2769
2769
fn fmt ( & self , f : & mut Formatter < ' _ > ) -> Result {
2770
- pointer_fmt_inner ( self . expose_provenance ( ) , f)
2770
+ if core:: mem:: size_of :: < <T as core:: ptr:: Pointee >:: Metadata > ( ) == 0 {
2771
+ pointer_fmt_inner ( self . expose_provenance ( ) , f)
2772
+ } else {
2773
+ f. debug_struct ( "Pointer" )
2774
+ . field_with ( "addr" , |f| pointer_fmt_inner ( self . expose_provenance ( ) , f) )
2775
+ . field ( "metadata" , & core:: ptr:: metadata ( * self ) )
2776
+ . finish ( )
2777
+ }
2771
2778
}
2772
2779
}
2773
2780
Original file line number Diff line number Diff line change @@ -42,12 +42,12 @@ fn test_fmt_debug_of_raw_pointers() {
42
42
check_fmt ( plain as * const i32 , "$HEX" ) ;
43
43
44
44
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 } " ) ;
47
47
48
48
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) } " ) ;
51
51
}
52
52
53
53
#[ test]
You can’t perform that action at this time.
0 commit comments