Skip to content

Commit 411f34b

Browse files
committed
std: fix module references on UNIX
1 parent cac470c commit 411f34b

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

Diff for: library/std/src/sys/pal/unix/fs.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2008,7 +2008,7 @@ mod remove_dir_impl {
20082008

20092009
pub unsafe fn openat(dirfd: c_int, pathname: *const c_char, flags: c_int) -> c_int {
20102010
get_openat_fn().map(|openat| openat(dirfd, pathname, flags)).unwrap_or_else(|| {
2011-
crate::sys::unix::os::set_errno(libc::ENOSYS);
2011+
crate::sys::pal::unix::os::set_errno(libc::ENOSYS);
20122012
-1
20132013
})
20142014
}
@@ -2019,15 +2019,15 @@ mod remove_dir_impl {
20192019
#[cfg(all(target_os = "macos", target_arch = "x86_64"))]
20202020
weak!(fn fdopendir(c_int) -> *mut DIR, "fdopendir$INODE64");
20212021
fdopendir.get().map(|fdopendir| fdopendir(fd)).unwrap_or_else(|| {
2022-
crate::sys::unix::os::set_errno(libc::ENOSYS);
2022+
crate::sys::pal::unix::os::set_errno(libc::ENOSYS);
20232023
crate::ptr::null_mut()
20242024
})
20252025
}
20262026

20272027
pub unsafe fn unlinkat(dirfd: c_int, pathname: *const c_char, flags: c_int) -> c_int {
20282028
weak!(fn unlinkat(c_int, *const c_char, c_int) -> c_int);
20292029
unlinkat.get().map(|unlinkat| unlinkat(dirfd, pathname, flags)).unwrap_or_else(|| {
2030-
crate::sys::unix::os::set_errno(libc::ENOSYS);
2030+
crate::sys::pal::unix::os::set_errno(libc::ENOSYS);
20312031
-1
20322032
})
20332033
}

Diff for: library/std/src/sys/pal/unix/net.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::net::{Shutdown, SocketAddr};
66
use crate::os::unix::io::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, RawFd};
77
use crate::str;
88
use crate::sys::fd::FileDesc;
9-
use crate::sys::unix::IsMinusOne;
9+
use crate::sys::pal::unix::IsMinusOne;
1010
use crate::sys_common::net::{getsockopt, setsockopt, sockaddr_to_addr};
1111
use crate::sys_common::{AsInner, FromInner, IntoInner};
1212
use crate::time::{Duration, Instant};

Diff for: library/std/src/sys/pal/unix/process/process_common.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ cfg_if::cfg_if! {
6363

6464
let bit = (signum - 1) as usize;
6565
if set.is_null() || bit >= (8 * size_of::<sigset_t>()) {
66-
crate::sys::unix::os::set_errno(libc::EINVAL);
66+
crate::sys::pal::unix::os::set_errno(libc::EINVAL);
6767
return -1;
6868
}
6969
let raw = slice::from_raw_parts_mut(

Diff for: library/std/src/sys/pal/unix/process/process_unix.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ impl Command {
362362
// If #[unix_sigpipe] is not specified, reset SIGPIPE to SIG_DFL for backward compatibility.
363363
//
364364
// #[unix_sigpipe] is an opportunity to change the default here.
365-
if !crate::sys::unix_sigpipe_attr_specified() {
365+
if !crate::sys::pal::unix_sigpipe_attr_specified() {
366366
#[cfg(target_os = "android")] // see issue #88585
367367
{
368368
let mut action: libc::sigaction = mem::zeroed();

Diff for: library/std/src/sys/pal/unix/process/process_unsupported.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use crate::fmt;
22
use crate::io;
33
use crate::num::NonZeroI32;
4+
use crate::sys::pal::unix::unsupported::*;
45
use crate::sys::process::process_common::*;
5-
use crate::sys::unix::unsupported::*;
66
use core::ffi::NonZero_c_int;
77

88
use libc::{c_int, pid_t};

Diff for: library/std/src/sys/pal/unix/stack_overflow.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ mod imp {
5555
use libc::{MAP_ANON, MAP_PRIVATE, PROT_NONE, PROT_READ, PROT_WRITE, SIGSEGV};
5656

5757
use crate::sync::atomic::{AtomicBool, AtomicPtr, Ordering};
58-
use crate::sys::unix::os::page_size;
58+
use crate::sys::pal::unix::os::page_size;
5959
use crate::sys_common::thread_info;
6060

6161
// Signal handler for the SIGSEGV and SIGBUS handlers. We've got guard pages

0 commit comments

Comments
 (0)