mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #84413 - CDirkx:args_inner_debug, r=m-ou-se

Browse Source 
Remove `sys::args::Args::inner_debug` and use `Debug` instead

This removes the method `sys::args::Args::inner_debug` on all platforms and implements `Debug` for `Args` instead.

I believe this creates a more natural API for the different platforms under `sys`: export a type `Args: Debug + Iterator + ...` vs. `Args: Iterator + ...` and with a method `inner_debug`.
This commit is contained in:
Dylan DPC 2021-04-22 18:14:43 +02:00 committed by GitHub
commit d1f5fc6017
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/std/src/env.rs
View File

@ -799,7 +799,7 @@ impl DoubleEndedIterator for Args {
#[stable(feature = "std_debug", since = "1.16.0")] #[stable(feature = "std_debug", since = "1.16.0")]
impl fmt::Debug for Args { impl fmt::Debug for Args {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("Args").field("inner", &self.inner.inner.inner_debug()).finish() f.debug_struct("Args").field("inner", &self.inner.inner).finish()
} }
} }
@ -840,7 +840,7 @@ impl DoubleEndedIterator for ArgsOs {
#[stable(feature = "std_debug", since = "1.16.0")] #[stable(feature = "std_debug", since = "1.16.0")]
impl fmt::Debug for ArgsOs { impl fmt::Debug for ArgsOs {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_struct("ArgsOs").field("inner", &self.inner.inner_debug()).finish() f.debug_struct("ArgsOs").field("inner", &self.inner).finish()
} }
} }

7
library/std/src/sys/hermit/args.rs
View File

@ -1,4 +1,5 @@
use crate::ffi::OsString; use crate::ffi::OsString;
use crate::fmt;
use crate::marker::PhantomData; use crate::marker::PhantomData;
use crate::vec; use crate::vec;
@ -22,9 +23,9 @@ pub struct Args {
_dont_send_or_sync_me: PhantomData<*mut ()>, _dont_send_or_sync_me: PhantomData<*mut ()>,
} }
impl Args { impl fmt::Debug for Args {
pub fn inner_debug(&self) -> &[OsString] { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.iter.as_slice() self.iter.as_slice().fmt(f)
} }
} }

7
library/std/src/sys/sgx/args.rs
View File

@ -1,5 +1,6 @@
use super::abi::usercalls::{alloc, raw::ByteBuffer}; use super::abi::usercalls::{alloc, raw::ByteBuffer};
use crate::ffi::OsString; use crate::ffi::OsString;
use crate::fmt;
use crate::slice; use crate::slice;
use crate::sync::atomic::{AtomicUsize, Ordering}; use crate::sync::atomic::{AtomicUsize, Ordering};
use crate::sys::os_str::Buf; use crate::sys::os_str::Buf;
@ -31,9 +32,9 @@ pub fn args() -> Args {
pub struct Args(slice::Iter<'static, OsString>); pub struct Args(slice::Iter<'static, OsString>);
impl Args { impl fmt::Debug for Args {
pub fn inner_debug(&self) -> &[OsString] { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.0.as_slice() self.0.as_slice().fmt(f)
} }
} }

7
library/std/src/sys/unix/args.rs
View File

@ -6,6 +6,7 @@
#![allow(dead_code)] // runtime init functions not used during testing #![allow(dead_code)] // runtime init functions not used during testing
use crate::ffi::OsString; use crate::ffi::OsString;
use crate::fmt;
use crate::marker::PhantomData; use crate::marker::PhantomData;
use crate::vec; use crate::vec;
@ -29,9 +30,9 @@ pub struct Args {
_dont_send_or_sync_me: PhantomData<*mut ()>, _dont_send_or_sync_me: PhantomData<*mut ()>,
} }
impl Args { impl fmt::Debug for Args {
pub fn inner_debug(&self) -> &[OsString] { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.iter.as_slice() self.iter.as_slice().fmt(f)
} }
} }

6
library/std/src/sys/unsupported/args.rs
View File

@ -9,9 +9,9 @@ pub fn args() -> Args {
Args {} Args {}
} }
impl Args { impl fmt::Debug for Args {
pub fn inner_debug(&self) -> &[OsString] { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
&[] f.debug_list().finish()
} }
} }

7
library/std/src/sys/wasi/args.rs
View File

@ -1,6 +1,7 @@
#![deny(unsafe_op_in_unsafe_fn)] #![deny(unsafe_op_in_unsafe_fn)]
use crate::ffi::{CStr, OsStr, OsString}; use crate::ffi::{CStr, OsStr, OsString};
use crate::fmt;
use crate::marker::PhantomData; use crate::marker::PhantomData;
use crate::os::wasi::ffi::OsStrExt; use crate::os::wasi::ffi::OsStrExt;
use crate::vec; use crate::vec;
@ -38,9 +39,9 @@ fn maybe_args() -> Option<Vec<OsString>> {
} }
} }
impl Args { impl fmt::Debug for Args {
pub fn inner_debug(&self) -> &[OsString] { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.iter.as_slice() self.iter.as_slice().fmt(f)
} }
} }

7
library/std/src/sys/wasm/args.rs
View File

@ -1,4 +1,5 @@
use crate::ffi::OsString; use crate::ffi::OsString;
use crate::fmt;
use crate::marker::PhantomData; use crate::marker::PhantomData;
use crate::vec; use crate::vec;
@ -17,9 +18,9 @@ pub struct Args {
_dont_send_or_sync_me: PhantomData<*mut ()>, _dont_send_or_sync_me: PhantomData<*mut ()>,
} }
impl Args { impl fmt::Debug for Args {
pub fn inner_debug(&self) -> &[OsString] { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.iter.as_slice() self.iter.as_slice().fmt(f)
} }
} }

14
library/std/src/sys/windows/args.rs
View File

@ -164,19 +164,9 @@ pub struct Args {
parsed_args_list: vec::IntoIter<OsString>, parsed_args_list: vec::IntoIter<OsString>,
} }
pub struct ArgsInnerDebug<'a> { impl fmt::Debug for Args {
args: &'a Args,
}
impl<'a> fmt::Debug for ArgsInnerDebug<'a> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.args.parsed_args_list.as_slice().fmt(f) self.parsed_args_list.as_slice().fmt(f)
}
}
impl Args {
pub fn inner_debug(&self) -> ArgsInnerDebug<'_> {
ArgsInnerDebug { args: self }
} }
} }