Skip to content

Commit bae79d9

Browse files
Rollup merge of rust-lang#123721 - madsmtm:fix-visionos, r=davidtwco
Various visionOS fixes A few small mistakes was introduced in rust-lang#121419, probably after the rename from `xros` to `visionos`. See the commits for details. CC `@agg23` Since you reviewed rust-lang#121419 r? davidtwco
2 parents 2f18bf0 + 4a36648 commit bae79d9

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

std/src/sys/pal/unix/process/process_unix.rs

+1-12
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,6 @@ use crate::os::linux::process::PidFd;
1111
#[cfg(target_os = "linux")]
1212
use crate::os::unix::io::AsRawFd;
1313

14-
#[cfg(any(
15-
target_os = "macos",
16-
target_os = "watchos",
17-
target_os = "visionos",
18-
target_os = "tvos",
19-
target_os = "freebsd",
20-
all(target_os = "linux", target_env = "gnu"),
21-
all(target_os = "linux", target_env = "musl"),
22-
target_os = "nto",
23-
))]
24-
use crate::sys::weak::weak;
25-
2614
#[cfg(target_os = "vxworks")]
2715
use libc::RTP_ID as pid_t;
2816

@@ -466,6 +454,7 @@ impl Command {
466454
envp: Option<&CStringArray>,
467455
) -> io::Result<Option<Process>> {
468456
use crate::mem::MaybeUninit;
457+
use crate::sys::weak::weak;
469458
use crate::sys::{self, cvt_nz, unix_sigpipe_attr_specified};
470459

471460
if self.get_gid().is_some()

0 commit comments

Comments
 (0)