diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2024-04-16 15:19:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-16 15:19:13 +0200 |
| commit | 1c8bdb93d986740dda310da9ae2327fecad505e2 (patch) | |
| tree | 59ddb12e56a191ba1037eeb50cd55dc1b2e86fdf /library/std/src/sys | |
| parent | 9a7adb8d81026f49230aff1b332cb58a00712b03 (diff) | |
| parent | 1a7238407c8964fb902f259d712eac9e87052680 (diff) | |
| download | rust-1c8bdb93d986740dda310da9ae2327fecad505e2.tar.gz rust-1c8bdb93d986740dda310da9ae2327fecad505e2.zip | |
Rollup merge of #123721 - madsmtm:fix-visionos, r=davidtwco
Various visionOS fixes A few small mistakes was introduced in https://github.com/rust-lang/rust/pull/121419, probably after the rename from `xros` to `visionos`. See the commits for details. CC `@agg23` Since you reviewed https://github.com/rust-lang/rust/pull/121419 r? davidtwco
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/pal/unix/process/process_unix.rs | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/library/std/src/sys/pal/unix/process/process_unix.rs b/library/std/src/sys/pal/unix/process/process_unix.rs index e798510f9e6..d65657790c4 100644 --- a/library/std/src/sys/pal/unix/process/process_unix.rs +++ b/library/std/src/sys/pal/unix/process/process_unix.rs @@ -11,18 +11,6 @@ use crate::os::linux::process::PidFd; #[cfg(target_os = "linux")] use crate::os::unix::io::AsRawFd; -#[cfg(any( - target_os = "macos", - target_os = "watchos", - target_os = "visionos", - target_os = "tvos", - target_os = "freebsd", - all(target_os = "linux", target_env = "gnu"), - all(target_os = "linux", target_env = "musl"), - target_os = "nto", -))] -use crate::sys::weak::weak; - #[cfg(target_os = "vxworks")] use libc::RTP_ID as pid_t; @@ -466,6 +454,7 @@ impl Command { envp: Option<&CStringArray>, ) -> io::Result<Option<Process>> { use crate::mem::MaybeUninit; + use crate::sys::weak::weak; use crate::sys::{self, cvt_nz, unix_sigpipe_attr_specified}; if self.get_gid().is_some() |
