Rollup merge of #148798 - tamird:esc-single-quote, r=Amanieu

Match <OsString as Debug>::fmt to that of str
Fixes#114583.

Author: matthiaskrgr

library/core/src/str/lossy.rs

@@ -1,3 +1,4 @@
+usesuper::char::EscapeDebugExtArgs;
 usesuper::from_utf8_unchecked;
 usesuper::validations::utf8_char_width;
 usecrate::fmt;
@@ -121,7 +122,11 @@ impl fmt::Debug for Debug<'_> {
 let valid = chunk.valid();
 letmut from = 0;
 for(i, c)in valid.char_indices(){
-let esc = c.escape_debug();
+let esc = c.escape_debug_ext(EscapeDebugExtArgs{
+escape_grapheme_extended:true,
+escape_single_quote:false,
+escape_double_quote:true,
+});
 // If char needs escaping, flush backlog so far and write, else skip
 if esc.len() != 1{
  f.write_str(&valid[from..i])?;

library/core/src/wtf8.rs

@@ -19,7 +19,7 @@
 // implementations, so, we'll have to add more doc(hidden)s anyway
 #![doc(hidden)]
 
-usecrate::char::encode_utf16_raw;
+usecrate::char::{EscapeDebugExtArgs,encode_utf16_raw};
 usecrate::clone::CloneToUninit;
 usecrate::fmt::{self,Write};
 usecrate::hash::{Hash,Hasher};
@@ -144,14 +144,20 @@ impl AsRef<[u8]> for Wtf8 {
 impl fmt::DebugforWtf8{
 fnfmt(&self,formatter:&mut fmt::Formatter<'_>) -> fmt::Result{
 fnwrite_str_escaped(f:&mut fmt::Formatter<'_>,s:&str) -> fmt::Result{
-usecrate::fmt::Write;
-for c in s.chars().flat_map(|c| c.escape_debug()){
+usecrate::fmt::Writeas _;
+for c in s.chars().flat_map(|c| {
+ c.escape_debug_ext(EscapeDebugExtArgs{
+escape_grapheme_extended:true,
+escape_single_quote:false,
+escape_double_quote:true,
+})
+}){
  f.write_char(c)?
 }
 Ok(())
 }
 
- formatter.write_str("\"")?;
+ formatter.write_char('"')?;
 letmut pos = 0;
 whileletSome((surrogate_pos, surrogate)) = self.next_surrogate(pos){
 // SAFETY: next_surrogate provides an index for a range of valid UTF-8 bytes.
@@ -164,7 +170,7 @@ impl fmt::Debug for Wtf8 {
 
 // SAFETY: after next_surrogate returns None, the remainder is valid UTF-8.
 write_str_escaped(formatter,unsafe{ str::from_utf8_unchecked(&self.bytes[pos..])})?;
- formatter.write_str("\"")
+ formatter.write_char('"')
 }
 }
 

library/coretests/tests/str_lossy.rs

@@ -80,4 +80,5 @@ fn debug() {
 b"Hello\xC0\x80 There\xE6\x83 Goodbye\xf4\x8d\x93\xaa".utf8_chunks().debug(),
 ),
 );
+assert_eq!("\"'\"",&format!("{:?}",b"'".utf8_chunks().debug()));
 }

library/std/src/env.rs

@@ -170,7 +170,7 @@ impl Iterator for Vars {
 impl fmt::DebugforVars{
 fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
 letSelf{inner:VarsOs{ inner }} = self;
- f.debug_struct("Vars").field("inner",&inner.str_debug()).finish()
+ f.debug_struct("Vars").field("inner", inner).finish()
 }
 }
 

library/std/src/ffi/os_str/tests.rs

@@ -303,3 +303,9 @@ fn clone_to_uninit() {
 unsafe{ a.clone_to_uninit(ptr::from_mut::<OsStr>(&mut b).cast())};
 assert_eq!(a,&*b);
 }
+
+#[test]
+fndebug(){
+let s = "'single quotes'";
+assert_eq!(format!("{:?}",OsStr::new(s)), format!("{:?}", s));
+}

library/std/src/sys/env/common.rs

@@ -5,27 +5,10 @@ pub struct Env {
 iter: vec::IntoIter<(OsString,OsString)>,
 }
 
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubstructEnvStrDebug<'a>{
-slice:&'a[(OsString,OsString)],
-}
-
-impl fmt::DebugforEnvStrDebug<'_>{
-fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
- f.debug_list()
-.entries(self.slice.iter().map(|(a, b)| (a.to_str().unwrap(), b.to_str().unwrap())))
-.finish()
-}
-}
-
 implEnv{
 pub(super)fnnew(env:Vec<(OsString,OsString)>) -> Self{
 Env{iter: env.into_iter()}
 }
-
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-EnvStrDebug{slice:self.iter.as_slice()}
-}
 }
 
 impl fmt::DebugforEnv{

library/std/src/sys/env/unsupported.rs

@@ -3,13 +3,6 @@ use crate::{fmt, io};
 
 pubstructEnv(!);
 
-implEnv{
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-self.0
-}
-}
-
 impl fmt::DebugforEnv{
 fnfmt(&self, _:&mut fmt::Formatter<'_>) -> fmt::Result{
 self.0

library/std/src/sys/env/windows.rs

@@ -8,30 +8,6 @@ pub struct Env {
 iter:EnvIterator,
 }
 
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubstructEnvStrDebug<'a>{
-iter:&'aEnvIterator,
-}
-
-impl fmt::DebugforEnvStrDebug<'_>{
-fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
-letSelf{ iter } = self;
-let iter:EnvIterator = (*iter).clone();
-letmut list = f.debug_list();
-for(a, b)in iter {
- list.entry(&(a.to_str().unwrap(), b.to_str().unwrap()));
-}
- list.finish()
-}
-}
-
-implEnv{
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-letSelf{base: _, iter } = self;
-EnvStrDebug{ iter }
-}
-}
-
 impl fmt::DebugforEnv{
 fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
 letSelf{base: _, iter } = self;

library/core/src/str/lossy.rs

@@ -1,3 +1,4 @@
+usesuper::char::EscapeDebugExtArgs;
 usesuper::from_utf8_unchecked;
 usesuper::validations::utf8_char_width;
 usecrate::fmt;
@@ -121,7 +122,11 @@ impl fmt::Debug for Debug<'_> {
 let valid = chunk.valid();
 letmut from = 0;
 for(i, c)in valid.char_indices(){
-let esc = c.escape_debug();
+let esc = c.escape_debug_ext(EscapeDebugExtArgs{
+escape_grapheme_extended:true,
+escape_single_quote:false,
+escape_double_quote:true,
+});
 // If char needs escaping, flush backlog so far and write, else skip
 if esc.len() != 1{
  f.write_str(&valid[from..i])?;

library/core/src/wtf8.rs

@@ -19,7 +19,7 @@
 // implementations, so, we'll have to add more doc(hidden)s anyway
 #![doc(hidden)]
 
-usecrate::char::encode_utf16_raw;
+usecrate::char::{EscapeDebugExtArgs,encode_utf16_raw};
 usecrate::clone::CloneToUninit;
 usecrate::fmt::{self,Write};
 usecrate::hash::{Hash,Hasher};
@@ -144,14 +144,20 @@ impl AsRef<[u8]> for Wtf8 {
 impl fmt::DebugforWtf8{
 fnfmt(&self,formatter:&mut fmt::Formatter<'_>) -> fmt::Result{
 fnwrite_str_escaped(f:&mut fmt::Formatter<'_>,s:&str) -> fmt::Result{
-usecrate::fmt::Write;
-for c in s.chars().flat_map(|c| c.escape_debug()){
+usecrate::fmt::Writeas _;
+for c in s.chars().flat_map(|c| {
+ c.escape_debug_ext(EscapeDebugExtArgs{
+escape_grapheme_extended:true,
+escape_single_quote:false,
+escape_double_quote:true,
+})
+}){
  f.write_char(c)?
 }
 Ok(())
 }
 
- formatter.write_str("\"")?;
+ formatter.write_char('"')?;
 letmut pos = 0;
 whileletSome((surrogate_pos, surrogate)) = self.next_surrogate(pos){
 // SAFETY: next_surrogate provides an index for a range of valid UTF-8 bytes.
@@ -164,7 +170,7 @@ impl fmt::Debug for Wtf8 {
 
 // SAFETY: after next_surrogate returns None, the remainder is valid UTF-8.
 write_str_escaped(formatter,unsafe{ str::from_utf8_unchecked(&self.bytes[pos..])})?;
- formatter.write_str("\"")
+ formatter.write_char('"')
 }
 }
 

library/coretests/tests/str_lossy.rs

@@ -80,4 +80,5 @@ fn debug() {
 b"Hello\xC0\x80 There\xE6\x83 Goodbye\xf4\x8d\x93\xaa".utf8_chunks().debug(),
 ),
 );
+assert_eq!("\"'\"",&format!("{:?}",b"'".utf8_chunks().debug()));
 }

library/std/src/env.rs

@@ -170,7 +170,7 @@ impl Iterator for Vars {
 impl fmt::DebugforVars{
 fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
 letSelf{inner:VarsOs{ inner }} = self;
- f.debug_struct("Vars").field("inner",&inner.str_debug()).finish()
+ f.debug_struct("Vars").field("inner", inner).finish()
 }
 }
 

library/std/src/ffi/os_str/tests.rs

@@ -303,3 +303,9 @@ fn clone_to_uninit() {
 unsafe{ a.clone_to_uninit(ptr::from_mut::<OsStr>(&mut b).cast())};
 assert_eq!(a,&*b);
 }
+
+#[test]
+fndebug(){
+let s = "'single quotes'";
+assert_eq!(format!("{:?}",OsStr::new(s)), format!("{:?}", s));
+}

library/std/src/sys/env/common.rs

@@ -5,27 +5,10 @@ pub struct Env {
 iter: vec::IntoIter<(OsString,OsString)>,
 }
 
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubstructEnvStrDebug<'a>{
-slice:&'a[(OsString,OsString)],
-}
-
-impl fmt::DebugforEnvStrDebug<'_>{
-fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
- f.debug_list()
-.entries(self.slice.iter().map(|(a, b)| (a.to_str().unwrap(), b.to_str().unwrap())))
-.finish()
-}
-}
-
 implEnv{
 pub(super)fnnew(env:Vec<(OsString,OsString)>) -> Self{
 Env{iter: env.into_iter()}
 }
-
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-EnvStrDebug{slice:self.iter.as_slice()}
-}
 }
 
 impl fmt::DebugforEnv{

library/std/src/sys/env/unsupported.rs

@@ -3,13 +3,6 @@ use crate::{fmt, io};
 
 pubstructEnv(!);
 
-implEnv{
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-self.0
-}
-}
-
 impl fmt::DebugforEnv{
 fnfmt(&self, _:&mut fmt::Formatter<'_>) -> fmt::Result{
 self.0

library/std/src/sys/env/windows.rs

@@ -8,30 +8,6 @@ pub struct Env {
 iter:EnvIterator,
 }
 
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubstructEnvStrDebug<'a>{
-iter:&'aEnvIterator,
-}
-
-impl fmt::DebugforEnvStrDebug<'_>{
-fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
-letSelf{ iter } = self;
-let iter:EnvIterator = (*iter).clone();
-letmut list = f.debug_list();
-for(a, b)in iter {
- list.entry(&(a.to_str().unwrap(), b.to_str().unwrap()));
-}
- list.finish()
-}
-}
-
-implEnv{
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-letSelf{base: _, iter } = self;
-EnvStrDebug{ iter }
-}
-}
-
 impl fmt::DebugforEnv{
 fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
 letSelf{base: _, iter } = self;

library/core/src/str/lossy.rs

@@ -1,3 +1,4 @@
+usesuper::char::EscapeDebugExtArgs;
 usesuper::from_utf8_unchecked;
 usesuper::validations::utf8_char_width;
 usecrate::fmt;
@@ -121,7 +122,11 @@ impl fmt::Debug for Debug<'_> {
 let valid = chunk.valid();
 letmut from = 0;
 for(i, c)in valid.char_indices(){
-let esc = c.escape_debug();
+let esc = c.escape_debug_ext(EscapeDebugExtArgs{
+escape_grapheme_extended:true,
+escape_single_quote:false,
+escape_double_quote:true,
+});
 // If char needs escaping, flush backlog so far and write, else skip
 if esc.len() != 1{
  f.write_str(&valid[from..i])?;

library/core/src/wtf8.rs

@@ -19,7 +19,7 @@
 // implementations, so, we'll have to add more doc(hidden)s anyway
 #![doc(hidden)]
 
-usecrate::char::encode_utf16_raw;
+usecrate::char::{EscapeDebugExtArgs,encode_utf16_raw};
 usecrate::clone::CloneToUninit;
 usecrate::fmt::{self,Write};
 usecrate::hash::{Hash,Hasher};
@@ -144,14 +144,20 @@ impl AsRef<[u8]> for Wtf8 {
 impl fmt::DebugforWtf8{
 fnfmt(&self,formatter:&mut fmt::Formatter<'_>) -> fmt::Result{
 fnwrite_str_escaped(f:&mut fmt::Formatter<'_>,s:&str) -> fmt::Result{
-usecrate::fmt::Write;
-for c in s.chars().flat_map(|c| c.escape_debug()){
+usecrate::fmt::Writeas _;
+for c in s.chars().flat_map(|c| {
+ c.escape_debug_ext(EscapeDebugExtArgs{
+escape_grapheme_extended:true,
+escape_single_quote:false,
+escape_double_quote:true,
+})
+}){
  f.write_char(c)?
 }
 Ok(())
 }
 
- formatter.write_str("\"")?;
+ formatter.write_char('"')?;
 letmut pos = 0;
 whileletSome((surrogate_pos, surrogate)) = self.next_surrogate(pos){
 // SAFETY: next_surrogate provides an index for a range of valid UTF-8 bytes.
@@ -164,7 +170,7 @@ impl fmt::Debug for Wtf8 {
 
 // SAFETY: after next_surrogate returns None, the remainder is valid UTF-8.
 write_str_escaped(formatter,unsafe{ str::from_utf8_unchecked(&self.bytes[pos..])})?;
- formatter.write_str("\"")
+ formatter.write_char('"')
 }
 }
 

library/coretests/tests/str_lossy.rs

@@ -80,4 +80,5 @@ fn debug() {
 b"Hello\xC0\x80 There\xE6\x83 Goodbye\xf4\x8d\x93\xaa".utf8_chunks().debug(),
 ),
 );
+assert_eq!("\"'\"",&format!("{:?}",b"'".utf8_chunks().debug()));
 }

library/std/src/env.rs

@@ -170,7 +170,7 @@ impl Iterator for Vars {
 impl fmt::DebugforVars{
 fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
 letSelf{inner:VarsOs{ inner }} = self;
- f.debug_struct("Vars").field("inner",&inner.str_debug()).finish()
+ f.debug_struct("Vars").field("inner", inner).finish()
 }
 }
 

library/std/src/ffi/os_str/tests.rs

@@ -303,3 +303,9 @@ fn clone_to_uninit() {
 unsafe{ a.clone_to_uninit(ptr::from_mut::<OsStr>(&mut b).cast())};
 assert_eq!(a,&*b);
 }
+
+#[test]
+fndebug(){
+let s = "'single quotes'";
+assert_eq!(format!("{:?}",OsStr::new(s)), format!("{:?}", s));
+}

library/std/src/sys/env/common.rs

@@ -5,27 +5,10 @@ pub struct Env {
 iter: vec::IntoIter<(OsString,OsString)>,
 }
 
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubstructEnvStrDebug<'a>{
-slice:&'a[(OsString,OsString)],
-}
-
-impl fmt::DebugforEnvStrDebug<'_>{
-fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
- f.debug_list()
-.entries(self.slice.iter().map(|(a, b)| (a.to_str().unwrap(), b.to_str().unwrap())))
-.finish()
-}
-}
-
 implEnv{
 pub(super)fnnew(env:Vec<(OsString,OsString)>) -> Self{
 Env{iter: env.into_iter()}
 }
-
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-EnvStrDebug{slice:self.iter.as_slice()}
-}
 }
 
 impl fmt::DebugforEnv{

library/std/src/sys/env/unsupported.rs

@@ -3,13 +3,6 @@ use crate::{fmt, io};
 
 pubstructEnv(!);
 
-implEnv{
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-self.0
-}
-}
-
 impl fmt::DebugforEnv{
 fnfmt(&self, _:&mut fmt::Formatter<'_>) -> fmt::Result{
 self.0

library/std/src/sys/env/windows.rs

@@ -8,30 +8,6 @@ pub struct Env {
 iter:EnvIterator,
 }
 
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubstructEnvStrDebug<'a>{
-iter:&'aEnvIterator,
-}
-
-impl fmt::DebugforEnvStrDebug<'_>{
-fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
-letSelf{ iter } = self;
-let iter:EnvIterator = (*iter).clone();
-letmut list = f.debug_list();
-for(a, b)in iter {
- list.entry(&(a.to_str().unwrap(), b.to_str().unwrap()));
-}
- list.finish()
-}
-}
-
-implEnv{
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-letSelf{base: _, iter } = self;
-EnvStrDebug{ iter }
-}
-}
-
 impl fmt::DebugforEnv{
 fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
 letSelf{base: _, iter } = self;

library/core/src/str/lossy.rs

@@ -1,3 +1,4 @@
+usesuper::char::EscapeDebugExtArgs;
 usesuper::from_utf8_unchecked;
 usesuper::validations::utf8_char_width;
 usecrate::fmt;
@@ -121,7 +122,11 @@ impl fmt::Debug for Debug<'_> {
 let valid = chunk.valid();
 letmut from = 0;
 for(i, c)in valid.char_indices(){
-let esc = c.escape_debug();
+let esc = c.escape_debug_ext(EscapeDebugExtArgs{
+escape_grapheme_extended:true,
+escape_single_quote:false,
+escape_double_quote:true,
+});
 // If char needs escaping, flush backlog so far and write, else skip
 if esc.len() != 1{
  f.write_str(&valid[from..i])?;

library/core/src/wtf8.rs

@@ -19,7 +19,7 @@
 // implementations, so, we'll have to add more doc(hidden)s anyway
 #![doc(hidden)]
 
-usecrate::char::encode_utf16_raw;
+usecrate::char::{EscapeDebugExtArgs,encode_utf16_raw};
 usecrate::clone::CloneToUninit;
 usecrate::fmt::{self,Write};
 usecrate::hash::{Hash,Hasher};
@@ -144,14 +144,20 @@ impl AsRef<[u8]> for Wtf8 {
 impl fmt::DebugforWtf8{
 fnfmt(&self,formatter:&mut fmt::Formatter<'_>) -> fmt::Result{
 fnwrite_str_escaped(f:&mut fmt::Formatter<'_>,s:&str) -> fmt::Result{
-usecrate::fmt::Write;
-for c in s.chars().flat_map(|c| c.escape_debug()){
+usecrate::fmt::Writeas _;
+for c in s.chars().flat_map(|c| {
+ c.escape_debug_ext(EscapeDebugExtArgs{
+escape_grapheme_extended:true,
+escape_single_quote:false,
+escape_double_quote:true,
+})
+}){
  f.write_char(c)?
 }
 Ok(())
 }
 
- formatter.write_str("\"")?;
+ formatter.write_char('"')?;
 letmut pos = 0;
 whileletSome((surrogate_pos, surrogate)) = self.next_surrogate(pos){
 // SAFETY: next_surrogate provides an index for a range of valid UTF-8 bytes.
@@ -164,7 +170,7 @@ impl fmt::Debug for Wtf8 {
 
 // SAFETY: after next_surrogate returns None, the remainder is valid UTF-8.
 write_str_escaped(formatter,unsafe{ str::from_utf8_unchecked(&self.bytes[pos..])})?;
- formatter.write_str("\"")
+ formatter.write_char('"')
 }
 }
 

library/coretests/tests/str_lossy.rs

@@ -80,4 +80,5 @@ fn debug() {
 b"Hello\xC0\x80 There\xE6\x83 Goodbye\xf4\x8d\x93\xaa".utf8_chunks().debug(),
 ),
 );
+assert_eq!("\"'\"",&format!("{:?}",b"'".utf8_chunks().debug()));
 }

library/std/src/env.rs

@@ -170,7 +170,7 @@ impl Iterator for Vars {
 impl fmt::DebugforVars{
 fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
 letSelf{inner:VarsOs{ inner }} = self;
- f.debug_struct("Vars").field("inner",&inner.str_debug()).finish()
+ f.debug_struct("Vars").field("inner", inner).finish()
 }
 }
 

library/std/src/ffi/os_str/tests.rs

@@ -303,3 +303,9 @@ fn clone_to_uninit() {
 unsafe{ a.clone_to_uninit(ptr::from_mut::<OsStr>(&mut b).cast())};
 assert_eq!(a,&*b);
 }
+
+#[test]
+fndebug(){
+let s = "'single quotes'";
+assert_eq!(format!("{:?}",OsStr::new(s)), format!("{:?}", s));
+}

library/std/src/sys/env/common.rs

@@ -5,27 +5,10 @@ pub struct Env {
 iter: vec::IntoIter<(OsString,OsString)>,
 }
 
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubstructEnvStrDebug<'a>{
-slice:&'a[(OsString,OsString)],
-}
-
-impl fmt::DebugforEnvStrDebug<'_>{
-fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
- f.debug_list()
-.entries(self.slice.iter().map(|(a, b)| (a.to_str().unwrap(), b.to_str().unwrap())))
-.finish()
-}
-}
-
 implEnv{
 pub(super)fnnew(env:Vec<(OsString,OsString)>) -> Self{
 Env{iter: env.into_iter()}
 }
-
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-EnvStrDebug{slice:self.iter.as_slice()}
-}
 }
 
 impl fmt::DebugforEnv{

library/std/src/sys/env/unsupported.rs

@@ -3,13 +3,6 @@ use crate::{fmt, io};
 
 pubstructEnv(!);
 
-implEnv{
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-self.0
-}
-}
-
 impl fmt::DebugforEnv{
 fnfmt(&self, _:&mut fmt::Formatter<'_>) -> fmt::Result{
 self.0

library/std/src/sys/env/windows.rs

@@ -8,30 +8,6 @@ pub struct Env {
 iter:EnvIterator,
 }
 
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubstructEnvStrDebug<'a>{
-iter:&'aEnvIterator,
-}
-
-impl fmt::DebugforEnvStrDebug<'_>{
-fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
-letSelf{ iter } = self;
-let iter:EnvIterator = (*iter).clone();
-letmut list = f.debug_list();
-for(a, b)in iter {
- list.entry(&(a.to_str().unwrap(), b.to_str().unwrap()));
-}
- list.finish()
-}
-}
-
-implEnv{
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-letSelf{base: _, iter } = self;
-EnvStrDebug{ iter }
-}
-}
-
 impl fmt::DebugforEnv{
 fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
 letSelf{base: _, iter } = self;

library/core/src/str/lossy.rs

@@ -1,3 +1,4 @@
+usesuper::char::EscapeDebugExtArgs;
 usesuper::from_utf8_unchecked;
 usesuper::validations::utf8_char_width;
 usecrate::fmt;
@@ -121,7 +122,11 @@ impl fmt::Debug for Debug<'_> {
 let valid = chunk.valid();
 letmut from = 0;
 for(i, c)in valid.char_indices(){
-let esc = c.escape_debug();
+let esc = c.escape_debug_ext(EscapeDebugExtArgs{
+escape_grapheme_extended:true,
+escape_single_quote:false,
+escape_double_quote:true,
+});
 // If char needs escaping, flush backlog so far and write, else skip
 if esc.len() != 1{
  f.write_str(&valid[from..i])?;

library/core/src/wtf8.rs

@@ -19,7 +19,7 @@
 // implementations, so, we'll have to add more doc(hidden)s anyway
 #![doc(hidden)]
 
-usecrate::char::encode_utf16_raw;
+usecrate::char::{EscapeDebugExtArgs,encode_utf16_raw};
 usecrate::clone::CloneToUninit;
 usecrate::fmt::{self,Write};
 usecrate::hash::{Hash,Hasher};
@@ -144,14 +144,20 @@ impl AsRef<[u8]> for Wtf8 {
 impl fmt::DebugforWtf8{
 fnfmt(&self,formatter:&mut fmt::Formatter<'_>) -> fmt::Result{
 fnwrite_str_escaped(f:&mut fmt::Formatter<'_>,s:&str) -> fmt::Result{
-usecrate::fmt::Write;
-for c in s.chars().flat_map(|c| c.escape_debug()){
+usecrate::fmt::Writeas _;
+for c in s.chars().flat_map(|c| {
+ c.escape_debug_ext(EscapeDebugExtArgs{
+escape_grapheme_extended:true,
+escape_single_quote:false,
+escape_double_quote:true,
+})
+}){
  f.write_char(c)?
 }
 Ok(())
 }
 
- formatter.write_str("\"")?;
+ formatter.write_char('"')?;
 letmut pos = 0;
 whileletSome((surrogate_pos, surrogate)) = self.next_surrogate(pos){
 // SAFETY: next_surrogate provides an index for a range of valid UTF-8 bytes.
@@ -164,7 +170,7 @@ impl fmt::Debug for Wtf8 {
 
 // SAFETY: after next_surrogate returns None, the remainder is valid UTF-8.
 write_str_escaped(formatter,unsafe{ str::from_utf8_unchecked(&self.bytes[pos..])})?;
- formatter.write_str("\"")
+ formatter.write_char('"')
 }
 }
 

library/coretests/tests/str_lossy.rs

@@ -80,4 +80,5 @@ fn debug() {
 b"Hello\xC0\x80 There\xE6\x83 Goodbye\xf4\x8d\x93\xaa".utf8_chunks().debug(),
 ),
 );
+assert_eq!("\"'\"",&format!("{:?}",b"'".utf8_chunks().debug()));
 }

library/std/src/env.rs

@@ -170,7 +170,7 @@ impl Iterator for Vars {
 impl fmt::DebugforVars{
 fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
 letSelf{inner:VarsOs{ inner }} = self;
- f.debug_struct("Vars").field("inner",&inner.str_debug()).finish()
+ f.debug_struct("Vars").field("inner", inner).finish()
 }
 }
 

library/std/src/ffi/os_str/tests.rs

@@ -303,3 +303,9 @@ fn clone_to_uninit() {
 unsafe{ a.clone_to_uninit(ptr::from_mut::<OsStr>(&mut b).cast())};
 assert_eq!(a,&*b);
 }
+
+#[test]
+fndebug(){
+let s = "'single quotes'";
+assert_eq!(format!("{:?}",OsStr::new(s)), format!("{:?}", s));
+}

library/std/src/sys/env/common.rs

@@ -5,27 +5,10 @@ pub struct Env {
 iter: vec::IntoIter<(OsString,OsString)>,
 }
 
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubstructEnvStrDebug<'a>{
-slice:&'a[(OsString,OsString)],
-}
-
-impl fmt::DebugforEnvStrDebug<'_>{
-fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
- f.debug_list()
-.entries(self.slice.iter().map(|(a, b)| (a.to_str().unwrap(), b.to_str().unwrap())))
-.finish()
-}
-}
-
 implEnv{
 pub(super)fnnew(env:Vec<(OsString,OsString)>) -> Self{
 Env{iter: env.into_iter()}
 }
-
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-EnvStrDebug{slice:self.iter.as_slice()}
-}
 }
 
 impl fmt::DebugforEnv{

library/std/src/sys/env/unsupported.rs

@@ -3,13 +3,6 @@ use crate::{fmt, io};
 
 pubstructEnv(!);
 
-implEnv{
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-self.0
-}
-}
-
 impl fmt::DebugforEnv{
 fnfmt(&self, _:&mut fmt::Formatter<'_>) -> fmt::Result{
 self.0

library/std/src/sys/env/windows.rs

@@ -8,30 +8,6 @@ pub struct Env {
 iter:EnvIterator,
 }
 
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubstructEnvStrDebug<'a>{
-iter:&'aEnvIterator,
-}
-
-impl fmt::DebugforEnvStrDebug<'_>{
-fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
-letSelf{ iter } = self;
-let iter:EnvIterator = (*iter).clone();
-letmut list = f.debug_list();
-for(a, b)in iter {
- list.entry(&(a.to_str().unwrap(), b.to_str().unwrap()));
-}
- list.finish()
-}
-}
-
-implEnv{
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-letSelf{base: _, iter } = self;
-EnvStrDebug{ iter }
-}
-}
-
 impl fmt::DebugforEnv{
 fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
 letSelf{base: _, iter } = self;

library/core/src/str/lossy.rs

@@ -1,3 +1,4 @@
+usesuper::char::EscapeDebugExtArgs;
 usesuper::from_utf8_unchecked;
 usesuper::validations::utf8_char_width;
 usecrate::fmt;
@@ -121,7 +122,11 @@ impl fmt::Debug for Debug<'_> {
 let valid = chunk.valid();
 letmut from = 0;
 for(i, c)in valid.char_indices(){
-let esc = c.escape_debug();
+let esc = c.escape_debug_ext(EscapeDebugExtArgs{
+escape_grapheme_extended:true,
+escape_single_quote:false,
+escape_double_quote:true,
+});
 // If char needs escaping, flush backlog so far and write, else skip
 if esc.len() != 1{
  f.write_str(&valid[from..i])?;

library/core/src/wtf8.rs

@@ -19,7 +19,7 @@
 // implementations, so, we'll have to add more doc(hidden)s anyway
 #![doc(hidden)]
 
-usecrate::char::encode_utf16_raw;
+usecrate::char::{EscapeDebugExtArgs,encode_utf16_raw};
 usecrate::clone::CloneToUninit;
 usecrate::fmt::{self,Write};
 usecrate::hash::{Hash,Hasher};
@@ -144,14 +144,20 @@ impl AsRef<[u8]> for Wtf8 {
 impl fmt::DebugforWtf8{
 fnfmt(&self,formatter:&mut fmt::Formatter<'_>) -> fmt::Result{
 fnwrite_str_escaped(f:&mut fmt::Formatter<'_>,s:&str) -> fmt::Result{
-usecrate::fmt::Write;
-for c in s.chars().flat_map(|c| c.escape_debug()){
+usecrate::fmt::Writeas _;
+for c in s.chars().flat_map(|c| {
+ c.escape_debug_ext(EscapeDebugExtArgs{
+escape_grapheme_extended:true,
+escape_single_quote:false,
+escape_double_quote:true,
+})
+}){
  f.write_char(c)?
 }
 Ok(())
 }
 
- formatter.write_str("\"")?;
+ formatter.write_char('"')?;
 letmut pos = 0;
 whileletSome((surrogate_pos, surrogate)) = self.next_surrogate(pos){
 // SAFETY: next_surrogate provides an index for a range of valid UTF-8 bytes.
@@ -164,7 +170,7 @@ impl fmt::Debug for Wtf8 {
 
 // SAFETY: after next_surrogate returns None, the remainder is valid UTF-8.
 write_str_escaped(formatter,unsafe{ str::from_utf8_unchecked(&self.bytes[pos..])})?;
- formatter.write_str("\"")
+ formatter.write_char('"')
 }
 }
 

library/coretests/tests/str_lossy.rs

@@ -80,4 +80,5 @@ fn debug() {
 b"Hello\xC0\x80 There\xE6\x83 Goodbye\xf4\x8d\x93\xaa".utf8_chunks().debug(),
 ),
 );
+assert_eq!("\"'\"",&format!("{:?}",b"'".utf8_chunks().debug()));
 }

library/std/src/env.rs

@@ -170,7 +170,7 @@ impl Iterator for Vars {
 impl fmt::DebugforVars{
 fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
 letSelf{inner:VarsOs{ inner }} = self;
- f.debug_struct("Vars").field("inner",&inner.str_debug()).finish()
+ f.debug_struct("Vars").field("inner", inner).finish()
 }
 }
 

library/std/src/ffi/os_str/tests.rs

@@ -303,3 +303,9 @@ fn clone_to_uninit() {
 unsafe{ a.clone_to_uninit(ptr::from_mut::<OsStr>(&mut b).cast())};
 assert_eq!(a,&*b);
 }
+
+#[test]
+fndebug(){
+let s = "'single quotes'";
+assert_eq!(format!("{:?}",OsStr::new(s)), format!("{:?}", s));
+}

library/std/src/sys/env/common.rs

@@ -5,27 +5,10 @@ pub struct Env {
 iter: vec::IntoIter<(OsString,OsString)>,
 }
 
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubstructEnvStrDebug<'a>{
-slice:&'a[(OsString,OsString)],
-}
-
-impl fmt::DebugforEnvStrDebug<'_>{
-fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
- f.debug_list()
-.entries(self.slice.iter().map(|(a, b)| (a.to_str().unwrap(), b.to_str().unwrap())))
-.finish()
-}
-}
-
 implEnv{
 pub(super)fnnew(env:Vec<(OsString,OsString)>) -> Self{
 Env{iter: env.into_iter()}
 }
-
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-EnvStrDebug{slice:self.iter.as_slice()}
-}
 }
 
 impl fmt::DebugforEnv{

library/std/src/sys/env/unsupported.rs

@@ -3,13 +3,6 @@ use crate::{fmt, io};
 
 pubstructEnv(!);
 
-implEnv{
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-self.0
-}
-}
-
 impl fmt::DebugforEnv{
 fnfmt(&self, _:&mut fmt::Formatter<'_>) -> fmt::Result{
 self.0

library/std/src/sys/env/windows.rs

@@ -8,30 +8,6 @@ pub struct Env {
 iter:EnvIterator,
 }
 
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubstructEnvStrDebug<'a>{
-iter:&'aEnvIterator,
-}
-
-impl fmt::DebugforEnvStrDebug<'_>{
-fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
-letSelf{ iter } = self;
-let iter:EnvIterator = (*iter).clone();
-letmut list = f.debug_list();
-for(a, b)in iter {
- list.entry(&(a.to_str().unwrap(), b.to_str().unwrap()));
-}
- list.finish()
-}
-}
-
-implEnv{
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-letSelf{base: _, iter } = self;
-EnvStrDebug{ iter }
-}
-}
-
 impl fmt::DebugforEnv{
 fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
 letSelf{base: _, iter } = self;

library/core/src/str/lossy.rs

@@ -1,3 +1,4 @@
+usesuper::char::EscapeDebugExtArgs;
 usesuper::from_utf8_unchecked;
 usesuper::validations::utf8_char_width;
 usecrate::fmt;
@@ -121,7 +122,11 @@ impl fmt::Debug for Debug<'_> {
 let valid = chunk.valid();
 letmut from = 0;
 for(i, c)in valid.char_indices(){
-let esc = c.escape_debug();
+let esc = c.escape_debug_ext(EscapeDebugExtArgs{
+escape_grapheme_extended:true,
+escape_single_quote:false,
+escape_double_quote:true,
+});
 // If char needs escaping, flush backlog so far and write, else skip
 if esc.len() != 1{
  f.write_str(&valid[from..i])?;

library/core/src/wtf8.rs

@@ -19,7 +19,7 @@
 // implementations, so, we'll have to add more doc(hidden)s anyway
 #![doc(hidden)]
 
-usecrate::char::encode_utf16_raw;
+usecrate::char::{EscapeDebugExtArgs,encode_utf16_raw};
 usecrate::clone::CloneToUninit;
 usecrate::fmt::{self,Write};
 usecrate::hash::{Hash,Hasher};
@@ -144,14 +144,20 @@ impl AsRef<[u8]> for Wtf8 {
 impl fmt::DebugforWtf8{
 fnfmt(&self,formatter:&mut fmt::Formatter<'_>) -> fmt::Result{
 fnwrite_str_escaped(f:&mut fmt::Formatter<'_>,s:&str) -> fmt::Result{
-usecrate::fmt::Write;
-for c in s.chars().flat_map(|c| c.escape_debug()){
+usecrate::fmt::Writeas _;
+for c in s.chars().flat_map(|c| {
+ c.escape_debug_ext(EscapeDebugExtArgs{
+escape_grapheme_extended:true,
+escape_single_quote:false,
+escape_double_quote:true,
+})
+}){
  f.write_char(c)?
 }
 Ok(())
 }
 
- formatter.write_str("\"")?;
+ formatter.write_char('"')?;
 letmut pos = 0;
 whileletSome((surrogate_pos, surrogate)) = self.next_surrogate(pos){
 // SAFETY: next_surrogate provides an index for a range of valid UTF-8 bytes.
@@ -164,7 +170,7 @@ impl fmt::Debug for Wtf8 {
 
 // SAFETY: after next_surrogate returns None, the remainder is valid UTF-8.
 write_str_escaped(formatter,unsafe{ str::from_utf8_unchecked(&self.bytes[pos..])})?;
- formatter.write_str("\"")
+ formatter.write_char('"')
 }
 }
 

library/coretests/tests/str_lossy.rs

@@ -80,4 +80,5 @@ fn debug() {
 b"Hello\xC0\x80 There\xE6\x83 Goodbye\xf4\x8d\x93\xaa".utf8_chunks().debug(),
 ),
 );
+assert_eq!("\"'\"",&format!("{:?}",b"'".utf8_chunks().debug()));
 }

library/std/src/env.rs

@@ -170,7 +170,7 @@ impl Iterator for Vars {
 impl fmt::DebugforVars{
 fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
 letSelf{inner:VarsOs{ inner }} = self;
- f.debug_struct("Vars").field("inner",&inner.str_debug()).finish()
+ f.debug_struct("Vars").field("inner", inner).finish()
 }
 }
 

library/std/src/ffi/os_str/tests.rs

@@ -303,3 +303,9 @@ fn clone_to_uninit() {
 unsafe{ a.clone_to_uninit(ptr::from_mut::<OsStr>(&mut b).cast())};
 assert_eq!(a,&*b);
 }
+
+#[test]
+fndebug(){
+let s = "'single quotes'";
+assert_eq!(format!("{:?}",OsStr::new(s)), format!("{:?}", s));
+}

library/std/src/sys/env/common.rs

@@ -5,27 +5,10 @@ pub struct Env {
 iter: vec::IntoIter<(OsString,OsString)>,
 }
 
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubstructEnvStrDebug<'a>{
-slice:&'a[(OsString,OsString)],
-}
-
-impl fmt::DebugforEnvStrDebug<'_>{
-fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
- f.debug_list()
-.entries(self.slice.iter().map(|(a, b)| (a.to_str().unwrap(), b.to_str().unwrap())))
-.finish()
-}
-}
-
 implEnv{
 pub(super)fnnew(env:Vec<(OsString,OsString)>) -> Self{
 Env{iter: env.into_iter()}
 }
-
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-EnvStrDebug{slice:self.iter.as_slice()}
-}
 }
 
 impl fmt::DebugforEnv{

library/std/src/sys/env/unsupported.rs

@@ -3,13 +3,6 @@ use crate::{fmt, io};
 
 pubstructEnv(!);
 
-implEnv{
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-self.0
-}
-}
-
 impl fmt::DebugforEnv{
 fnfmt(&self, _:&mut fmt::Formatter<'_>) -> fmt::Result{
 self.0

library/std/src/sys/env/windows.rs

@@ -8,30 +8,6 @@ pub struct Env {
 iter:EnvIterator,
 }
 
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubstructEnvStrDebug<'a>{
-iter:&'aEnvIterator,
-}
-
-impl fmt::DebugforEnvStrDebug<'_>{
-fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
-letSelf{ iter } = self;
-let iter:EnvIterator = (*iter).clone();
-letmut list = f.debug_list();
-for(a, b)in iter {
- list.entry(&(a.to_str().unwrap(), b.to_str().unwrap()));
-}
- list.finish()
-}
-}
-
-implEnv{
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-letSelf{base: _, iter } = self;
-EnvStrDebug{ iter }
-}
-}
-
 impl fmt::DebugforEnv{
 fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
 letSelf{base: _, iter } = self;

library/core/src/str/lossy.rs

@@ -1,3 +1,4 @@
+usesuper::char::EscapeDebugExtArgs;
 usesuper::from_utf8_unchecked;
 usesuper::validations::utf8_char_width;
 usecrate::fmt;
@@ -121,7 +122,11 @@ impl fmt::Debug for Debug<'_> {
 let valid = chunk.valid();
 letmut from = 0;
 for(i, c)in valid.char_indices(){
-let esc = c.escape_debug();
+let esc = c.escape_debug_ext(EscapeDebugExtArgs{
+escape_grapheme_extended:true,
+escape_single_quote:false,
+escape_double_quote:true,
+});
 // If char needs escaping, flush backlog so far and write, else skip
 if esc.len() != 1{
  f.write_str(&valid[from..i])?;

library/core/src/wtf8.rs

@@ -19,7 +19,7 @@
 // implementations, so, we'll have to add more doc(hidden)s anyway
 #![doc(hidden)]
 
-usecrate::char::encode_utf16_raw;
+usecrate::char::{EscapeDebugExtArgs,encode_utf16_raw};
 usecrate::clone::CloneToUninit;
 usecrate::fmt::{self,Write};
 usecrate::hash::{Hash,Hasher};
@@ -144,14 +144,20 @@ impl AsRef<[u8]> for Wtf8 {
 impl fmt::DebugforWtf8{
 fnfmt(&self,formatter:&mut fmt::Formatter<'_>) -> fmt::Result{
 fnwrite_str_escaped(f:&mut fmt::Formatter<'_>,s:&str) -> fmt::Result{
-usecrate::fmt::Write;
-for c in s.chars().flat_map(|c| c.escape_debug()){
+usecrate::fmt::Writeas _;
+for c in s.chars().flat_map(|c| {
+ c.escape_debug_ext(EscapeDebugExtArgs{
+escape_grapheme_extended:true,
+escape_single_quote:false,
+escape_double_quote:true,
+})
+}){
  f.write_char(c)?
 }
 Ok(())
 }
 
- formatter.write_str("\"")?;
+ formatter.write_char('"')?;
 letmut pos = 0;
 whileletSome((surrogate_pos, surrogate)) = self.next_surrogate(pos){
 // SAFETY: next_surrogate provides an index for a range of valid UTF-8 bytes.
@@ -164,7 +170,7 @@ impl fmt::Debug for Wtf8 {
 
 // SAFETY: after next_surrogate returns None, the remainder is valid UTF-8.
 write_str_escaped(formatter,unsafe{ str::from_utf8_unchecked(&self.bytes[pos..])})?;
- formatter.write_str("\"")
+ formatter.write_char('"')
 }
 }
 

library/coretests/tests/str_lossy.rs

@@ -80,4 +80,5 @@ fn debug() {
 b"Hello\xC0\x80 There\xE6\x83 Goodbye\xf4\x8d\x93\xaa".utf8_chunks().debug(),
 ),
 );
+assert_eq!("\"'\"",&format!("{:?}",b"'".utf8_chunks().debug()));
 }

library/std/src/env.rs

@@ -170,7 +170,7 @@ impl Iterator for Vars {
 impl fmt::DebugforVars{
 fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
 letSelf{inner:VarsOs{ inner }} = self;
- f.debug_struct("Vars").field("inner",&inner.str_debug()).finish()
+ f.debug_struct("Vars").field("inner", inner).finish()
 }
 }
 

library/std/src/ffi/os_str/tests.rs

@@ -303,3 +303,9 @@ fn clone_to_uninit() {
 unsafe{ a.clone_to_uninit(ptr::from_mut::<OsStr>(&mut b).cast())};
 assert_eq!(a,&*b);
 }
+
+#[test]
+fndebug(){
+let s = "'single quotes'";
+assert_eq!(format!("{:?}",OsStr::new(s)), format!("{:?}", s));
+}

library/std/src/sys/env/common.rs

@@ -5,27 +5,10 @@ pub struct Env {
 iter: vec::IntoIter<(OsString,OsString)>,
 }
 
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubstructEnvStrDebug<'a>{
-slice:&'a[(OsString,OsString)],
-}
-
-impl fmt::DebugforEnvStrDebug<'_>{
-fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
- f.debug_list()
-.entries(self.slice.iter().map(|(a, b)| (a.to_str().unwrap(), b.to_str().unwrap())))
-.finish()
-}
-}
-
 implEnv{
 pub(super)fnnew(env:Vec<(OsString,OsString)>) -> Self{
 Env{iter: env.into_iter()}
 }
-
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-EnvStrDebug{slice:self.iter.as_slice()}
-}
 }
 
 impl fmt::DebugforEnv{

library/std/src/sys/env/unsupported.rs

@@ -3,13 +3,6 @@ use crate::{fmt, io};
 
 pubstructEnv(!);
 
-implEnv{
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-self.0
-}
-}
-
 impl fmt::DebugforEnv{
 fnfmt(&self, _:&mut fmt::Formatter<'_>) -> fmt::Result{
 self.0

library/std/src/sys/env/windows.rs

@@ -8,30 +8,6 @@ pub struct Env {
 iter:EnvIterator,
 }
 
-// FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
-pubstructEnvStrDebug<'a>{
-iter:&'aEnvIterator,
-}
-
-impl fmt::DebugforEnvStrDebug<'_>{
-fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
-letSelf{ iter } = self;
-let iter:EnvIterator = (*iter).clone();
-letmut list = f.debug_list();
-for(a, b)in iter {
- list.entry(&(a.to_str().unwrap(), b.to_str().unwrap()));
-}
- list.finish()
-}
-}
-
-implEnv{
-pubfnstr_debug(&self) -> impl fmt::Debug + '_{
-letSelf{base: _, iter } = self;
-EnvStrDebug{ iter }
-}
-}
-
 impl fmt::DebugforEnv{
 fnfmt(&self,f:&mut fmt::Formatter<'_>) -> fmt::Result{
 letSelf{base: _, iter } = self;