@@ -2,7 +2,7 @@ use crate::ffi::OsStr;
22use crate :: os:: unix:: ffi:: OsStrExt ;
33use crate :: path:: Path ;
44use crate :: sys:: cvt;
5- use crate :: { ascii , fmt, io, mem, ptr} ;
5+ use crate :: { fmt, io, mem, ptr} ;
66
77// FIXME(#43348): Make libc adapt #[doc(cfg(...))] so we don't need these fake definitions here?
88#[ cfg( not( unix) ) ]
@@ -64,18 +64,6 @@ enum AddressKind<'a> {
6464 Abstract ( & ' a [ u8 ] ) ,
6565}
6666
67- struct AsciiEscaped < ' a > ( & ' a [ u8 ] ) ;
68-
69- impl < ' a > fmt:: Display for AsciiEscaped < ' a > {
70- fn fmt ( & self , fmt : & mut fmt:: Formatter < ' _ > ) -> fmt:: Result {
71- write ! ( fmt, "\" " ) ?;
72- for byte in self . 0 . iter ( ) . cloned ( ) . flat_map ( ascii:: escape_default) {
73- write ! ( fmt, "{}" , byte as char ) ?;
74- }
75- write ! ( fmt, "\" " )
76- }
77- }
78-
7967/// An address associated with a Unix socket.
8068///
8169/// # Examples
@@ -343,7 +331,7 @@ impl fmt::Debug for SocketAddr {
343331 fn fmt ( & self , fmt : & mut fmt:: Formatter < ' _ > ) -> fmt:: Result {
344332 match self . address ( ) {
345333 AddressKind :: Unnamed => write ! ( fmt, "(unnamed)" ) ,
346- AddressKind :: Abstract ( name) => write ! ( fmt, "{} (abstract)" , AsciiEscaped ( name) ) ,
334+ AddressKind :: Abstract ( name) => write ! ( fmt, "\" {} \" (abstract)" , name. escape_ascii ( ) ) ,
347335 AddressKind :: Pathname ( path) => write ! ( fmt, "{path:?} (pathname)" ) ,
348336 }
349337 }
0 commit comments