Remove <os::Vars as Debug> workaround

library/std/src/env.rs

@@ -170,7 +170,7 @@ impl Iterator for Vars {
 impl fmt::Debug for Vars {
  fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
  let Self { 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/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.
-pub struct EnvStrDebug<'a> {
- slice: &'a [(OsString, OsString)],
-}
-
-impl fmt::Debug for EnvStrDebug<'_> {
- fn fmt(&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()
- }
-}
-
 impl Env {
  pub(super) fn new(env: Vec<(OsString, OsString)>) -> Self {
  Env { iter: env.into_iter() }
  }
-
- pub fn str_debug(&self) -> impl fmt::Debug + '_ {
- EnvStrDebug { slice: self.iter.as_slice() }
- }
 }
 
 impl fmt::Debug for Env {

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

@@ -3,13 +3,6 @@ use crate::{fmt, io};
 
 pub struct Env(!);
 
-impl Env {
- // FIXME(https://github.com/rust-lang/rust/issues/114583): Remove this when <OsStr as Debug>::fmt matches <str as Debug>::fmt.
- pub fn str_debug(&self) -> impl fmt::Debug + '_ {
- self.0
- }
-}
-
 impl fmt::Debug for Env {
  fn fmt(&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.
-pub struct EnvStrDebug<'a> {
- iter: &'a EnvIterator,
-}
-
-impl fmt::Debug for EnvStrDebug<'_> {
- fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
- let Self { iter } = self;
- let iter: EnvIterator = (*iter).clone();
- let mut list = f.debug_list();
- for (a, b) in iter {
- list.entry(&(a.to_str().unwrap(), b.to_str().unwrap()));
- }
- list.finish()
- }
-}
-
-impl Env {
- pub fn str_debug(&self) -> impl fmt::Debug + '_ {
- let Self { base: _, iter } = self;
- EnvStrDebug { iter }
- }
-}
-
 impl fmt::Debug for Env {
  fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
  let Self { base: _, iter } = self;