diff options
| author | William Woodruff <william@yossarian.net> | 2020-11-24 14:55:35 -0500 |
|---|---|---|
| committer | William Woodruff <william@yossarian.net> | 2020-11-24 14:55:35 -0500 |
| commit | 3d8329f6fc678024fc74754f4e483d6a83fee098 (patch) | |
| tree | 42467147c875c45dc1e158cb8bffcc2b030bfd73 /library/std/src/sys | |
| parent | fe0bea2cc191fcdf8ca79a17168d696c664eded3 (diff) | |
| download | rust-3d8329f6fc678024fc74754f4e483d6a83fee098.tar.gz rust-3d8329f6fc678024fc74754f4e483d6a83fee098.zip | |
ext/ucred: fmt check
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/unix/ext/ucred.rs | 28 | ||||
| -rw-r--r-- | library/std/src/sys/unix/ext/ucred/tests.rs | 6 |
2 files changed, 8 insertions, 26 deletions
diff --git a/library/std/src/sys/unix/ext/ucred.rs b/library/std/src/sys/unix/ext/ucred.rs index e2aeb39f995..1b4c18d3d84 100644 --- a/library/std/src/sys/unix/ext/ucred.rs +++ b/library/std/src/sys/unix/ext/ucred.rs @@ -28,17 +28,10 @@ pub struct UCred { #[cfg(any(target_os = "android", target_os = "linux"))] pub use self::impl_linux::peer_cred; -#[cfg(any( - target_os = "dragonfly", - target_os = "freebsd", - target_os = "openbsd" -))] +#[cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))] pub use self::impl_bsd::peer_cred; -#[cfg(any( - target_os = "macos", - target_os = "ios", -))] +#[cfg(any(target_os = "macos", target_os = "ios",))] pub use self::impl_mac::peer_cred; #[cfg(any(target_os = "linux", target_os = "android"))] @@ -77,11 +70,7 @@ pub mod impl_linux { } } -#[cfg(any( - target_os = "dragonfly", - target_os = "freebsd", - target_os = "openbsd" -))] +#[cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))] pub mod impl_bsd { use super::UCred; use crate::io; @@ -98,16 +87,13 @@ pub mod impl_bsd { } } -#[cfg(any( - target_os = "macos", - target_os = "ios", -))] +#[cfg(any(target_os = "macos", target_os = "ios",))] pub mod impl_mac { use super::UCred; - use crate::{io, mem}; use crate::os::unix::io::AsRawFd; use crate::os::unix::net::UnixStream; - use libc::{c_void, getpeereid, getsockopt, pid_t, socklen_t, SOL_LOCAL, LOCAL_PEERPID}; + use crate::{io, mem}; + use libc::{c_void, getpeereid, getsockopt, pid_t, socklen_t, LOCAL_PEERPID, SOL_LOCAL}; pub fn peer_cred(socket: &UnixStream) -> io::Result<UCred> { let mut cred = UCred { uid: 1, gid: 1, pid: None }; @@ -126,7 +112,7 @@ pub mod impl_mac { SOL_LOCAL, LOCAL_PEERPID, &mut pid as *mut pid_t as *mut c_void, - &mut pid_size + &mut pid_size, ); if ret == 0 && pid_size as usize == mem::size_of::<pid_t>() { diff --git a/library/std/src/sys/unix/ext/ucred/tests.rs b/library/std/src/sys/unix/ext/ucred/tests.rs index b3e45d3337c..42d79418cf7 100644 --- a/library/std/src/sys/unix/ext/ucred/tests.rs +++ b/library/std/src/sys/unix/ext/ucred/tests.rs @@ -25,11 +25,7 @@ fn test_socket_pair() { } #[test] -#[cfg(any( - target_os = "linux", - target_os = "ios", - target_os = "macos", -))] +#[cfg(any(target_os = "linux", target_os = "ios", target_os = "macos",))] fn test_socket_pair_pids(arg: Type) -> RetType { // Create two connected sockets and get their peer credentials. let (sock_a, sock_b) = UnixStream::pair().unwrap(); |
