diff options
| author | bors <bors@rust-lang.org> | 2022-09-12 13:16:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-12 13:16:14 +0000 |
| commit | 7f115e3cd239af753aeb398a114fa321a3ce584b (patch) | |
| tree | 4f941d47b92d9baffa335a306be4a71d9a60b1ac /library/std/src | |
| parent | a93214ec06b57f1eb0cc2fd07e3c4b86b1b1d949 (diff) | |
| parent | 9bf89e72184c4f598360f81cea7612759b560372 (diff) | |
| download | rust-7f115e3cd239af753aeb398a114fa321a3ce584b.tar.gz rust-7f115e3cd239af753aeb398a114fa321a3ce584b.zip | |
Auto merge of #101716 - Dylan-DPC:rollup-ayvh6nd, r=Dylan-DPC
Rollup of 9 pull requests Successful merges: - #100293 (Add inline-llvm option for disabling/enabling LLVM inlining) - #100767 (Remove manual <[u8]>::escape_ascii) - #101668 (Suggest pub instead of public for const type item) - #101671 (Fix naming format of IEEE 754 standard) - #101676 (Check that the types in return position `impl Trait` in traits are well-formed) - #101681 (Deny return-position `impl Trait` in traits for object safety) - #101693 (Update browser UI test 0 10) - #101701 (Rustdoc-Json: Add tests for trait impls.) - #101706 (rustdoc: remove no-op `#search`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/os/unix/net/addr.rs | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/library/std/src/os/unix/net/addr.rs b/library/std/src/os/unix/net/addr.rs index bb313c7597b..094085e1942 100644 --- a/library/std/src/os/unix/net/addr.rs +++ b/library/std/src/os/unix/net/addr.rs @@ -2,7 +2,7 @@ use crate::ffi::OsStr; use crate::os::unix::ffi::OsStrExt; use crate::path::Path; use crate::sys::cvt; -use crate::{ascii, fmt, io, mem, ptr}; +use crate::{fmt, io, mem, ptr}; // FIXME(#43348): Make libc adapt #[doc(cfg(...))] so we don't need these fake definitions here? #[cfg(not(unix))] @@ -64,18 +64,6 @@ enum AddressKind<'a> { Abstract(&'a [u8]), } -struct AsciiEscaped<'a>(&'a [u8]); - -impl<'a> fmt::Display for AsciiEscaped<'a> { - fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { - write!(fmt, "\"")?; - for byte in self.0.iter().cloned().flat_map(ascii::escape_default) { - write!(fmt, "{}", byte as char)?; - } - write!(fmt, "\"") - } -} - /// An address associated with a Unix socket. /// /// # Examples @@ -343,7 +331,7 @@ impl fmt::Debug for SocketAddr { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { match self.address() { AddressKind::Unnamed => write!(fmt, "(unnamed)"), - AddressKind::Abstract(name) => write!(fmt, "{} (abstract)", AsciiEscaped(name)), + AddressKind::Abstract(name) => write!(fmt, "\"{}\" (abstract)", name.escape_ascii()), AddressKind::Pathname(path) => write!(fmt, "{path:?} (pathname)"), } } |
