Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions library/alloc/src/wtf8/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,17 @@ fn wtf8_encode_wide_size_hint() {
assert!(iter.next().is_none());
}

#[test]
fn wtf8_encode_wide_debug() {
let mut string = Wtf8Buf::from_str("aé ");
string.push(CodePoint::from_u32(0xD83D).unwrap());
string.push_char('💩');
assert_eq!(
format!("{:?}", string.encode_wide()),
r#"EncodeWide(['a', 'é', ' ', 0xD83D, 0xD83D, 0xDCA9])"#
);
}

#[test]
fn wtf8_clone_into() {
let mut string = Wtf8Buf::new();
Expand Down
29 changes: 25 additions & 4 deletions library/core/src/wtf8.rs
Original file line number Diff line number Diff line change
Expand Up @@ -562,15 +562,36 @@ impl Iterator for EncodeWide<'_> {
}
}

#[stable(feature = "encode_wide_fused_iterator", since = "1.62.0")]
impl FusedIterator for EncodeWide<'_> {}

#[stable(feature = "encode_wide_debug", since = "CURRENT_RUSTC_VERSION")]
impl fmt::Debug for EncodeWide<'_> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("EncodeWide").finish_non_exhaustive()
struct CodeUnit(u16);
impl fmt::Debug for CodeUnit {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
// This output attempts to balance readability with precision.
// Render characters which take only one WTF-16 code unit using
// `char` syntax and everything else as code units with hex
// integer syntax (including paired and unpaired surrogate
// halves). Since Rust has no `char`-like type for WTF-16, this
// isn't perfect, so if this output isn't suitable, it is open
// to being changed (see #140153).
match char::from_u32(self.0 as u32) {
Some(c) => write!(f, "{c:?}"),
None => write!(f, "0x{:04X}", self.0),
}
}
}

write!(f, "EncodeWide(")?;
f.debug_list().entries(self.clone().map(CodeUnit)).finish()?;
write!(f, ")")?;
Ok(())
}
}

#[stable(feature = "encode_wide_fused_iterator", since = "1.62.0")]
impl FusedIterator for EncodeWide<'_> {}

impl Hash for CodePoint {
#[inline]
fn hash<H: Hasher>(&self, state: &mut H) {
Expand Down
1 change: 0 additions & 1 deletion library/std/src/sys_common/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
//! Progress on this is tracked in #84187.

#![allow(missing_docs)]
#![allow(missing_debug_implementations)]

#[cfg(test)]
mod tests;
Expand Down
Loading