Rollup merge of #140153 - thaliaarchi:encode-wide-debug, r=ChrisDenton

Implement `Debug` for `EncodeWide`

Since `std::os::windows::ffi::EncodeWide` was reexported from `std::sys_common::wtf8::EncodeWide`, which has `#![allow(missing_debug_implementations)]` in the parent module, it did not implement `Debug`. When it was moved to `core`, a placeholder impl was added; fill it in.

This becomes insta-stable.

r? libs-api
This commit is contained in:
Matthias Krüger 2025-10-18 08:08:35 +02:00 committed by GitHub
commit b46db5c6b7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 38 additions and 7 deletions

View file

@ -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("");
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();

View file

@ -562,15 +562,36 @@ impl Iterator for EncodeWide<'_> {
}
}
impl fmt::Debug for EncodeWide<'_> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("EncodeWide").finish_non_exhaustive()
}
}
#[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 {
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(())
}
}
impl Hash for CodePoint {
#[inline]
fn hash<H: Hasher>(&self, state: &mut H) {

View file

@ -15,7 +15,6 @@
//! Progress on this is tracked in #84187.
#![allow(missing_docs)]
#![allow(missing_debug_implementations)]
#[cfg(test)]
mod tests;