mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use a private type definition to reduce cfg noise

Browse source 
I checked with t-libs to make sure this is OK to do on stable functions:
https://rust-lang.zulipchat.com/#narrow/stream/219381-t-libs/topic/Replacing.20std.20function.20arg.20type.20with.20private.20type.20def.3F
This commit is contained in:
Mark Drobnak 2022-06-07 19:57:15 -07:00
parent 5d5039e1b8
commit c814f842e4
No known key found for this signature in database
GPG key ID: 47A133F3BF9D03D3
1 changed files with 16 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
library/std/src/os/unix/process.rs
View file

@ -12,6 +12,16 @@ use crate::sealed::Sealed;
use crate::sys; use crate::sys;
use crate::sys_common::{AsInner, AsInnerMut, FromInner, IntoInner}; use crate::sys_common::{AsInner, AsInnerMut, FromInner, IntoInner};
#[cfg(not(any(target_os = "vxworks", target_os = "espidf", target_os = "horizon")))]
type UserId = u32;
#[cfg(not(any(target_os = "vxworks", target_os = "espidf", target_os = "horizon")))]
type GroupId = u32;
#[cfg(any(target_os = "vxworks", target_os = "espidf", target_os = "horizon"))]
type UserId = u16;
#[cfg(any(target_os = "vxworks", target_os = "espidf", target_os = "horizon"))]
type GroupId = u16;
/// Unix-specific extensions to the [`process::Command`] builder. /// Unix-specific extensions to the [`process::Command`] builder.
/// ///
/// This trait is sealed: it cannot be implemented outside the standard library. /// This trait is sealed: it cannot be implemented outside the standard library.
@ -22,32 +32,17 @@ pub trait CommandExt: Sealed {
/// `setuid` call in the child process. Failure in the `setuid` /// `setuid` call in the child process. Failure in the `setuid`
/// call will cause the spawn to fail. /// call will cause the spawn to fail.
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
fn uid( fn uid(&mut self, id: UserId) -> &mut process::Command;
&mut self,
#[cfg(not(any(target_os = "vxworks", target_os = "espidf", target_os = "horizon")))]
id: u32,
#[cfg(any(target_os = "vxworks", target_os = "espidf", target_os = "horizon"))] id: u16,
) -> &mut process::Command;
/// Similar to `uid`, but sets the group ID of the child process. This has /// Similar to `uid`, but sets the group ID of the child process. This has
/// the same semantics as the `uid` field. /// the same semantics as the `uid` field.
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
fn gid( fn gid(&mut self, id: GroupId) -> &mut process::Command;
&mut self,
#[cfg(not(any(target_os = "vxworks", target_os = "espidf", target_os = "horizon")))]
id: u32,
#[cfg(any(target_os = "vxworks", target_os = "espidf", target_os = "horizon"))] id: u16,
) -> &mut process::Command;
/// Sets the supplementary group IDs for the calling process. Translates to /// Sets the supplementary group IDs for the calling process. Translates to
/// a `setgroups` call in the child process. /// a `setgroups` call in the child process.
#[unstable(feature = "setgroups", issue = "90747")] #[unstable(feature = "setgroups", issue = "90747")]
fn groups( fn groups(&mut self, groups: &[GroupId]) -> &mut process::Command;
&mut self,
#[cfg(not(any(target_os = "vxworks", target_os = "espidf", target_os = "horizon")))] groups: &[u32],
#[cfg(any(target_os = "vxworks", target_os = "espidf", target_os = "horizon"))]
groups: &[u16],
) -> &mut process::Command;
/// Schedules a closure to be run just before the `exec` function is /// Schedules a closure to be run just before the `exec` function is
/// invoked. /// invoked.
@ -161,32 +156,17 @@ pub trait CommandExt: Sealed {
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
impl CommandExt for process::Command { impl CommandExt for process::Command {
fn uid( fn uid(&mut self, id: UserId) -> &mut process::Command {
&mut self,
#[cfg(not(any(target_os = "vxworks", target_os = "espidf", target_os = "horizon")))]
id: u32,
#[cfg(any(target_os = "vxworks", target_os = "espidf", target_os = "horizon"))] id: u16,
) -> &mut process::Command {
self.as_inner_mut().uid(id); self.as_inner_mut().uid(id);
self self
} }
fn gid( fn gid(&mut self, id: GroupId) -> &mut process::Command {
&mut self,
#[cfg(not(any(target_os = "vxworks", target_os = "espidf", target_os = "horizon")))]
id: u32,
#[cfg(any(target_os = "vxworks", target_os = "espidf", target_os = "horizon"))] id: u16,
) -> &mut process::Command {
self.as_inner_mut().gid(id); self.as_inner_mut().gid(id);
self self
} }
fn groups( fn groups(&mut self, groups: &[GroupId]) -> &mut process::Command {
&mut self,
#[cfg(not(any(target_os = "vxworks", target_os = "espidf", target_os = "horizon")))] groups: &[u32],
#[cfg(any(target_os = "vxworks", target_os = "espidf", target_os = "horizon"))]
groups: &[u16],
) -> &mut process::Command {
self.as_inner_mut().groups(groups); self.as_inner_mut().groups(groups);
self self
} }