1
Fork 0

std: Stabilize command_access

Tracking issue: #44434
This commit is contained in:
Jade 2021-08-28 12:47:04 -07:00
parent 42a2a53ec1
commit af83a9613c
2 changed files with 11 additions and 15 deletions

View file

@ -115,7 +115,7 @@ use crate::path::Path;
use crate::str; use crate::str;
use crate::sys::pipe::{read2, AnonPipe}; use crate::sys::pipe::{read2, AnonPipe};
use crate::sys::process as imp; use crate::sys::process as imp;
#[unstable(feature = "command_access", issue = "44434")] #[stable(feature = "command_access", since = "1.56.0")]
pub use crate::sys_common::process::CommandEnvs; pub use crate::sys_common::process::CommandEnvs;
use crate::sys_common::{AsInner, AsInnerMut, FromInner, IntoInner}; use crate::sys_common::{AsInner, AsInnerMut, FromInner, IntoInner};
@ -943,13 +943,12 @@ impl Command {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// # #![feature(command_access)]
/// use std::process::Command; /// use std::process::Command;
/// ///
/// let cmd = Command::new("echo"); /// let cmd = Command::new("echo");
/// assert_eq!(cmd.get_program(), "echo"); /// assert_eq!(cmd.get_program(), "echo");
/// ``` /// ```
#[unstable(feature = "command_access", issue = "44434")] #[stable(feature = "command_access", since = "1.56.0")]
pub fn get_program(&self) -> &OsStr { pub fn get_program(&self) -> &OsStr {
self.inner.get_program() self.inner.get_program()
} }
@ -963,7 +962,6 @@ impl Command {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// # #![feature(command_access)]
/// use std::ffi::OsStr; /// use std::ffi::OsStr;
/// use std::process::Command; /// use std::process::Command;
/// ///
@ -972,7 +970,7 @@ impl Command {
/// let args: Vec<&OsStr> = cmd.get_args().collect(); /// let args: Vec<&OsStr> = cmd.get_args().collect();
/// assert_eq!(args, &["first", "second"]); /// assert_eq!(args, &["first", "second"]);
/// ``` /// ```
#[unstable(feature = "command_access", issue = "44434")] #[stable(feature = "command_access", since = "1.56.0")]
pub fn get_args(&self) -> CommandArgs<'_> { pub fn get_args(&self) -> CommandArgs<'_> {
CommandArgs { inner: self.inner.get_args() } CommandArgs { inner: self.inner.get_args() }
} }
@ -992,7 +990,6 @@ impl Command {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// # #![feature(command_access)]
/// use std::ffi::OsStr; /// use std::ffi::OsStr;
/// use std::process::Command; /// use std::process::Command;
/// ///
@ -1004,7 +1001,7 @@ impl Command {
/// (OsStr::new("TZ"), None) /// (OsStr::new("TZ"), None)
/// ]); /// ]);
/// ``` /// ```
#[unstable(feature = "command_access", issue = "44434")] #[stable(feature = "command_access", since = "1.56.0")]
pub fn get_envs(&self) -> CommandEnvs<'_> { pub fn get_envs(&self) -> CommandEnvs<'_> {
self.inner.get_envs() self.inner.get_envs()
} }
@ -1016,7 +1013,6 @@ impl Command {
/// # Examples /// # Examples
/// ///
/// ``` /// ```
/// # #![feature(command_access)]
/// use std::path::Path; /// use std::path::Path;
/// use std::process::Command; /// use std::process::Command;
/// ///
@ -1025,7 +1021,7 @@ impl Command {
/// cmd.current_dir("/bin"); /// cmd.current_dir("/bin");
/// assert_eq!(cmd.get_current_dir(), Some(Path::new("/bin"))); /// assert_eq!(cmd.get_current_dir(), Some(Path::new("/bin")));
/// ``` /// ```
#[unstable(feature = "command_access", issue = "44434")] #[stable(feature = "command_access", since = "1.56.0")]
pub fn get_current_dir(&self) -> Option<&Path> { pub fn get_current_dir(&self) -> Option<&Path> {
self.inner.get_current_dir() self.inner.get_current_dir()
} }
@ -1057,13 +1053,13 @@ impl AsInnerMut<imp::Command> for Command {
/// ///
/// This struct is created by [`Command::get_args`]. See its documentation for /// This struct is created by [`Command::get_args`]. See its documentation for
/// more. /// more.
#[unstable(feature = "command_access", issue = "44434")] #[stable(feature = "command_access", since = "1.56.0")]
#[derive(Debug)] #[derive(Debug)]
pub struct CommandArgs<'a> { pub struct CommandArgs<'a> {
inner: imp::CommandArgs<'a>, inner: imp::CommandArgs<'a>,
} }
#[unstable(feature = "command_access", issue = "44434")] #[stable(feature = "command_access", since = "1.56.0")]
impl<'a> Iterator for CommandArgs<'a> { impl<'a> Iterator for CommandArgs<'a> {
type Item = &'a OsStr; type Item = &'a OsStr;
fn next(&mut self) -> Option<&'a OsStr> { fn next(&mut self) -> Option<&'a OsStr> {
@ -1074,7 +1070,7 @@ impl<'a> Iterator for CommandArgs<'a> {
} }
} }
#[unstable(feature = "command_access", issue = "44434")] #[stable(feature = "command_access", since = "1.56.0")]
impl<'a> ExactSizeIterator for CommandArgs<'a> { impl<'a> ExactSizeIterator for CommandArgs<'a> {
fn len(&self) -> usize { fn len(&self) -> usize {
self.inner.len() self.inner.len()

View file

@ -106,13 +106,13 @@ impl CommandEnv {
/// This struct is created by /// This struct is created by
/// [`Command::get_envs`][crate::process::Command::get_envs]. See its /// [`Command::get_envs`][crate::process::Command::get_envs]. See its
/// documentation for more. /// documentation for more.
#[unstable(feature = "command_access", issue = "44434")] #[stable(feature = "command_access", since = "1.56.0")]
#[derive(Debug)] #[derive(Debug)]
pub struct CommandEnvs<'a> { pub struct CommandEnvs<'a> {
iter: crate::collections::btree_map::Iter<'a, EnvKey, Option<OsString>>, iter: crate::collections::btree_map::Iter<'a, EnvKey, Option<OsString>>,
} }
#[unstable(feature = "command_access", issue = "44434")] #[stable(feature = "command_access", since = "1.56.0")]
impl<'a> Iterator for CommandEnvs<'a> { impl<'a> Iterator for CommandEnvs<'a> {
type Item = (&'a OsStr, Option<&'a OsStr>); type Item = (&'a OsStr, Option<&'a OsStr>);
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
@ -123,7 +123,7 @@ impl<'a> Iterator for CommandEnvs<'a> {
} }
} }
#[unstable(feature = "command_access", issue = "44434")] #[stable(feature = "command_access", since = "1.56.0")]
impl<'a> ExactSizeIterator for CommandEnvs<'a> { impl<'a> ExactSizeIterator for CommandEnvs<'a> {
fn len(&self) -> usize { fn len(&self) -> usize {
self.iter.len() self.iter.len()