Skip to content

Commit bf67b6b

Browse files
authored
Rollup merge of #100767 - kadiwa4:escape_ascii, r=jackh726
Remove manual <[u8]>::escape_ascii `@rustbot` label: +C-cleanup
2 parents 9ab2913 + 68531ea commit bf67b6b

File tree

3 files changed

+5
-27
lines changed

3 files changed

+5
-27
lines changed

core/src/ffi/c_str.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
use crate::ascii;
21
use crate::cmp::Ordering;
32
use crate::ffi::c_char;
4-
use crate::fmt::{self, Write};
3+
use crate::fmt;
54
use crate::intrinsics;
65
use crate::ops;
76
use crate::slice;
@@ -161,11 +160,7 @@ impl fmt::Display for FromBytesUntilNulError {
161160
#[stable(feature = "cstr_debug", since = "1.3.0")]
162161
impl fmt::Debug for CStr {
163162
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
164-
write!(f, "\"")?;
165-
for byte in self.to_bytes().iter().flat_map(|&b| ascii::escape_default(b)) {
166-
f.write_char(byte as char)?;
167-
}
168-
write!(f, "\"")
163+
write!(f, "\"{}\"", self.to_bytes().escape_ascii())
169164
}
170165
}
171166

proc_macro/src/lib.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1353,12 +1353,7 @@ impl Literal {
13531353
/// Byte string literal.
13541354
#[stable(feature = "proc_macro_lib2", since = "1.29.0")]
13551355
pub fn byte_string(bytes: &[u8]) -> Literal {
1356-
let string = bytes
1357-
.iter()
1358-
.cloned()
1359-
.flat_map(std::ascii::escape_default)
1360-
.map(Into::<char>::into)
1361-
.collect::<String>();
1356+
let string = bytes.escape_ascii().to_string();
13621357
Literal::new(bridge::LitKind::ByteStr, &string, None)
13631358
}
13641359

std/src/os/unix/net/addr.rs

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::ffi::OsStr;
22
use crate::os::unix::ffi::OsStrExt;
33
use crate::path::Path;
44
use 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

Comments
 (0)