diff options
| author | bors <bors@rust-lang.org> | 2021-07-26 00:22:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-07-26 00:22:45 +0000 |
| commit | 0ded6adf6607b5c2657c930d5efebecf60578cd3 (patch) | |
| tree | 36bb66eb12de558c5ab4e5a03e9a83ff18b41850 | |
| parent | 5782f01a5136b1f7539b23f67e832f0b994c215d (diff) | |
| parent | 42adaab699c86679de8173cac4167061e0aaf8d7 (diff) | |
| download | rust-0ded6adf6607b5c2657c930d5efebecf60578cd3.tar.gz rust-0ded6adf6607b5c2657c930d5efebecf60578cd3.zip | |
Auto merge of #87430 - devnexen:netbsd_ucred_enabled, r=joshtriplett
netbsd enabled ucred
| -rw-r--r-- | library/std/src/os/unix/mod.rs | 1 | ||||
| -rw-r--r-- | library/std/src/os/unix/net/stream.rs | 3 | ||||
| -rw-r--r-- | library/std/src/os/unix/ucred.rs | 14 |
3 files changed, 16 insertions, 2 deletions
diff --git a/library/std/src/os/unix/mod.rs b/library/std/src/os/unix/mod.rs index 6fc1c89a2ba..73489c0f162 100644 --- a/library/std/src/os/unix/mod.rs +++ b/library/std/src/os/unix/mod.rs @@ -82,6 +82,7 @@ pub mod thread; target_os = "freebsd", target_os = "ios", target_os = "macos", + target_os = "netbsd", target_os = "openbsd" ))] pub mod ucred; diff --git a/library/std/src/os/unix/net/stream.rs b/library/std/src/os/unix/net/stream.rs index a6f6e091305..fba084375e5 100644 --- a/library/std/src/os/unix/net/stream.rs +++ b/library/std/src/os/unix/net/stream.rs @@ -21,6 +21,7 @@ use crate::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd}; target_os = "freebsd", target_os = "ios", target_os = "macos", + target_os = "netbsd", target_os = "openbsd" ))] use crate::os::unix::ucred; @@ -38,6 +39,7 @@ use crate::time::Duration; target_os = "freebsd", target_os = "ios", target_os = "macos", + target_os = "netbsd", target_os = "openbsd" ))] pub use ucred::UCred; @@ -208,6 +210,7 @@ impl UnixStream { target_os = "freebsd", target_os = "ios", target_os = "macos", + target_os = "netbsd", target_os = "openbsd" ))] pub fn peer_cred(&self) -> io::Result<UCred> { diff --git a/library/std/src/os/unix/ucred.rs b/library/std/src/os/unix/ucred.rs index 1b4c18d3d84..32e6430d3f6 100644 --- a/library/std/src/os/unix/ucred.rs +++ b/library/std/src/os/unix/ucred.rs @@ -28,7 +28,12 @@ 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", + target_os = "netbsd" +))] pub use self::impl_bsd::peer_cred; #[cfg(any(target_os = "macos", target_os = "ios",))] @@ -70,7 +75,12 @@ 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", + target_os = "netbsd" +))] pub mod impl_bsd { use super::UCred; use crate::io; |