Remove internal usage of use ...::syscalls::*. (#198)

Remove lines like

> pub(crate) use super::fs::syscalls::*;

from the top-level syscalls.rs files, and just have code reference the
specific modules they need.

Author: sunfishcode

src/fs/abs.rs

@@ -29,5 +29,5 @@ use imp::fs::StatFs;
 )))]
 #[inline]
 pub fn statfs<P: path::Arg>(path: P) -> io::Result<StatFs> {
-    path.into_with_z_str(|path| imp::syscalls::statfs(path))
+    path.into_with_z_str(|path| imp::fs::syscalls::statfs(path))
 }

src/fs/at.rs

@@ -46,7 +46,7 @@ pub fn openat<P: path::Arg, Fd: AsFd>(
     create_mode: Mode,
 ) -> io::Result<OwnedFd> {
     let dirfd = dirfd.as_fd();
-    path.into_with_z_str(|path| imp::syscalls::openat(dirfd, path, oflags, create_mode))
+    path.into_with_z_str(|path| imp::fs::syscalls::openat(dirfd, path, oflags, create_mode))
 }
 
 /// `readlinkat(fd, path)`—Reads the contents of a symlink.
@@ -78,7 +78,7 @@ fn _readlinkat(dirfd: BorrowedFd<'_>, path: &ZStr, mut buffer: Vec<u8>) -> io::R
     buffer.resize(buffer.capacity(), 0_u8);
 
     loop {
-        let nread = imp::syscalls::readlinkat(dirfd, path, &mut buffer)?;
+        let nread = imp::fs::syscalls::readlinkat(dirfd, path, &mut buffer)?;
 
         let nread = nread as usize;
         assert!(nread <= buffer.len());
@@ -102,7 +102,7 @@ fn _readlinkat(dirfd: BorrowedFd<'_>, path: &ZStr, mut buffer: Vec<u8>) -> io::R
 #[inline]
 pub fn mkdirat<P: path::Arg, Fd: AsFd>(dirfd: &Fd, path: P, mode: Mode) -> io::Result<()> {
     let dirfd = dirfd.as_fd();
-    path.into_with_z_str(|path| imp::syscalls::mkdirat(dirfd, path, mode))
+    path.into_with_z_str(|path| imp::fs::syscalls::mkdirat(dirfd, path, mode))
 }
 
 /// `linkat(old_dirfd, old_path, new_dirfd, new_path, flags)`—Creates a hard
@@ -126,7 +126,7 @@ pub fn linkat<P: path::Arg, Q: path::Arg, PFd: AsFd, QFd: AsFd>(
     let new_dirfd = new_dirfd.as_fd();
     old_path.into_with_z_str(|old_path| {
         new_path.into_with_z_str(|new_path| {
-            imp::syscalls::linkat(old_dirfd, old_path, new_dirfd, new_path, flags)
+            imp::fs::syscalls::linkat(old_dirfd, old_path, new_dirfd, new_path, flags)
         })
     })
 }
@@ -146,7 +146,7 @@ pub fn linkat<P: path::Arg, Q: path::Arg, PFd: AsFd, QFd: AsFd>(
 #[inline]
 pub fn unlinkat<P: path::Arg, Fd: AsFd>(dirfd: &Fd, path: P, flags: AtFlags) -> io::Result<()> {
     let dirfd = dirfd.as_fd();
-    path.into_with_z_str(|path| imp::syscalls::unlinkat(dirfd, path, flags))
+    path.into_with_z_str(|path| imp::fs::syscalls::unlinkat(dirfd, path, flags))
 }
 
 /// `renameat(old_dirfd, old_path, new_dirfd, new_path)`—Renames a file or
@@ -169,7 +169,7 @@ pub fn renameat<P: path::Arg, Q: path::Arg, PFd: AsFd, QFd: AsFd>(
     let new_dirfd = new_dirfd.as_fd();
     old_path.into_with_z_str(|old_path| {
         new_path.into_with_z_str(|new_path| {
-            imp::syscalls::renameat(old_dirfd, old_path, new_dirfd, new_path)
+            imp::fs::syscalls::renameat(old_dirfd, old_path, new_dirfd, new_path)
         })
     })
 }
@@ -195,7 +195,7 @@ pub fn renameat_with<P: path::Arg, Q: path::Arg, PFd: AsFd, QFd: AsFd>(
     let new_dirfd = new_dirfd.as_fd();
     old_path.into_with_z_str(|old_path| {
         new_path.into_with_z_str(|new_path| {
-            imp::syscalls::renameat2(old_dirfd, old_path, new_dirfd, new_path, flags)
+            imp::fs::syscalls::renameat2(old_dirfd, old_path, new_dirfd, new_path, flags)
         })
     })
 }
@@ -216,7 +216,8 @@ pub fn symlinkat<P: path::Arg, Q: path::Arg, Fd: AsFd>(
 ) -> io::Result<()> {
     let new_dirfd = new_dirfd.as_fd();
     old_path.into_with_z_str(|old_path| {
-        new_path.into_with_z_str(|new_path| imp::syscalls::symlinkat(old_path, new_dirfd, new_path))
+        new_path
+            .into_with_z_str(|new_path| imp::fs::syscalls::symlinkat(old_path, new_dirfd, new_path))
     })
 }
 
@@ -237,7 +238,7 @@ pub fn symlinkat<P: path::Arg, Q: path::Arg, Fd: AsFd>(
 #[doc(alias = "fstatat")]
 pub fn statat<P: path::Arg, Fd: AsFd>(dirfd: &Fd, path: P, flags: AtFlags) -> io::Result<Stat> {
     let dirfd = dirfd.as_fd();
-    path.into_with_z_str(|path| imp::syscalls::statat(dirfd, path, flags))
+    path.into_with_z_str(|path| imp::fs::syscalls::statat(dirfd, path, flags))
 }
 
 /// `faccessat(dirfd, path, access, flags)`—Tests permissions for a file or
@@ -259,7 +260,7 @@ pub fn accessat<P: path::Arg, Fd: AsFd>(
     flags: AtFlags,
 ) -> io::Result<()> {
     let dirfd = dirfd.as_fd();
-    path.into_with_z_str(|path| imp::syscalls::accessat(dirfd, path, access, flags))
+    path.into_with_z_str(|path| imp::fs::syscalls::accessat(dirfd, path, access, flags))
 }
 
 /// `utimensat(dirfd, path, times, flags)`—Sets file or directory timestamps.
@@ -278,7 +279,7 @@ pub fn utimensat<P: path::Arg, Fd: AsFd>(
     flags: AtFlags,
 ) -> io::Result<()> {
     let dirfd = dirfd.as_fd();
-    path.into_with_z_str(|path| imp::syscalls::utimensat(dirfd, path, times, flags))
+    path.into_with_z_str(|path| imp::fs::syscalls::utimensat(dirfd, path, times, flags))
 }
 
 /// `fchmodat(dirfd, path, mode, 0)`—Sets file or directory permissions.
@@ -300,7 +301,7 @@ pub fn utimensat<P: path::Arg, Fd: AsFd>(
 #[doc(alias = "fchmodat")]
 pub fn chmodat<P: path::Arg, Fd: AsFd>(dirfd: &Fd, path: P, mode: Mode) -> io::Result<()> {
     let dirfd = dirfd.as_fd();
-    path.into_with_z_str(|path| imp::syscalls::chmodat(dirfd, path, mode))
+    path.into_with_z_str(|path| imp::fs::syscalls::chmodat(dirfd, path, mode))
 }
 
 /// `fclonefileat(src, dst_dir, dst, flags)`—Efficiently copies between files.
@@ -320,7 +321,7 @@ pub fn fclonefileat<Fd: AsFd, DstFd: AsFd, P: path::Arg>(
     let srcfd = src.as_fd();
     let dst_dirfd = dst_dir.as_fd();
     dst.into_with_z_str(|dst| {
-        imp::syscalls::fclonefileat(srcfd.as_fd(), dst_dirfd.as_fd(), &dst, flags)
+        imp::fs::syscalls::fclonefileat(srcfd.as_fd(), dst_dirfd.as_fd(), &dst, flags)
     })
 }
 
@@ -342,7 +343,7 @@ pub fn mknodat<P: path::Arg, Fd: AsFd>(
     dev: Dev,
 ) -> io::Result<()> {
     let dirfd = dirfd.as_fd();
-    path.into_with_z_str(|path| imp::syscalls::mknodat(dirfd, path, file_type, mode, dev))
+    path.into_with_z_str(|path| imp::fs::syscalls::mknodat(dirfd, path, file_type, mode, dev))
 }
 
 /// `fchownat(dirfd, path, owner, group, flags)`—Sets file or directory
@@ -364,5 +365,5 @@ pub fn chownat<P: path::Arg, Fd: AsFd>(
     flags: AtFlags,
 ) -> io::Result<()> {
     let dirfd = dirfd.as_fd();
-    path.into_with_z_str(|path| imp::syscalls::chownat(dirfd, path, owner, group, flags))
+    path.into_with_z_str(|path| imp::fs::syscalls::chownat(dirfd, path, owner, group, flags))
 }

src/fs/copy_file_range.rs

@@ -18,5 +18,5 @@ pub fn copy_file_range<InFd: AsFd, OutFd: AsFd>(
 ) -> io::Result<u64> {
     let fd_in = fd_in.as_fd();
     let fd_out = fd_out.as_fd();
-    imp::syscalls::copy_file_range(fd_in, off_in, fd_out, off_out, len)
+    imp::fs::syscalls::copy_file_range(fd_in, off_in, fd_out, off_out, len)
 }

src/fs/fadvise.rs

@@ -16,5 +16,5 @@ pub use imp::fs::Advice;
 #[doc(alias = "posix_fadvise")]
 pub fn fadvise<Fd: AsFd>(fd: &Fd, offset: u64, len: u64, advice: Advice) -> io::Result<()> {
     let fd = fd.as_fd();
-    imp::syscalls::fadvise(fd, offset, len, advice)
+    imp::fs::syscalls::fadvise(fd, offset, len, advice)
 }

src/fs/fcntl.rs

@@ -20,7 +20,7 @@ use imp::fs::{FdFlags, OFlags};
 #[doc(alias = "F_GETFD")]
 pub fn fcntl_getfd<Fd: AsFd>(fd: &Fd) -> io::Result<FdFlags> {
     let fd = fd.as_fd();
-    imp::syscalls::fcntl_getfd(fd)
+    imp::fs::syscalls::fcntl_getfd(fd)
 }
 
 /// `fcntl(fd, F_SETFD, flags)`—Sets a file descriptor's flags.
@@ -35,7 +35,7 @@ pub fn fcntl_getfd<Fd: AsFd>(fd: &Fd) -> io::Result<FdFlags> {
 #[doc(alias = "F_SETFD")]
 pub fn fcntl_setfd<Fd: AsFd>(fd: &Fd, flags: FdFlags) -> io::Result<()> {
     let fd = fd.as_fd();
-    imp::syscalls::fcntl_setfd(fd, flags)
+    imp::fs::syscalls::fcntl_setfd(fd, flags)
 }
 
 /// `fcntl(fd, F_GETFL)`—Returns a file descriptor's access mode and status.
@@ -50,7 +50,7 @@ pub fn fcntl_setfd<Fd: AsFd>(fd: &Fd, flags: FdFlags) -> io::Result<()> {
 #[doc(alias = "F_GETFL")]
 pub fn fcntl_getfl<Fd: AsFd>(fd: &Fd) -> io::Result<OFlags> {
     let fd = fd.as_fd();
-    imp::syscalls::fcntl_getfl(fd)
+    imp::fs::syscalls::fcntl_getfl(fd)
 }
 
 /// `fcntl(fd, F_SETFL, flags)`—Sets a file descriptor's status.
@@ -65,7 +65,7 @@ pub fn fcntl_getfl<Fd: AsFd>(fd: &Fd) -> io::Result<OFlags> {
 #[doc(alias = "F_SETFL")]
 pub fn fcntl_setfl<Fd: AsFd>(fd: &Fd, flags: OFlags) -> io::Result<()> {
     let fd = fd.as_fd();
-    imp::syscalls::fcntl_setfl(fd, flags)
+    imp::fs::syscalls::fcntl_setfl(fd, flags)
 }
 
 /// `fcntl(fd, F_GET_SEALS)`
@@ -84,7 +84,7 @@ pub fn fcntl_setfl<Fd: AsFd>(fd: &Fd, flags: OFlags) -> io::Result<()> {
 #[doc(alias = "F_GET_SEALS")]
 pub fn fcntl_get_seals<Fd: AsFd>(fd: &Fd) -> io::Result<SealFlags> {
     let fd = fd.as_fd();
-    imp::syscalls::fcntl_get_seals(fd)
+    imp::fs::syscalls::fcntl_get_seals(fd)
 }
 
 #[cfg(any(
@@ -111,7 +111,7 @@ pub use imp::fs::SealFlags;
 #[doc(alias = "F_ADD_SEALS")]
 pub fn fcntl_add_seals<Fd: AsFd>(fd: &Fd, seals: SealFlags) -> io::Result<()> {
     let fd = fd.as_fd();
-    imp::syscalls::fcntl_add_seals(fd, seals)
+    imp::fs::syscalls::fcntl_add_seals(fd, seals)
 }
 
 /// `fcntl(fd, F_DUPFD_CLOEXEC)`—Creates a new `OwnedFd` instance, with value
@@ -134,5 +134,5 @@ pub fn fcntl_add_seals<Fd: AsFd>(fd: &Fd, seals: SealFlags) -> io::Result<()> {
 #[doc(alias = "F_DUPFD_CLOEXEC")]
 pub fn fcntl_dupfd_cloexec<Fd: AsFd>(fd: &Fd, min: RawFd) -> io::Result<OwnedFd> {
     let fd = fd.as_fd();
-    imp::syscalls::fcntl_dupfd_cloexec(fd, min)
+    imp::fs::syscalls::fcntl_dupfd_cloexec(fd, min)
 }

src/fs/fcntl_darwin.rs

@@ -10,7 +10,7 @@ use imp::fd::AsFd;
 #[inline]
 pub fn fcntl_rdadvise<Fd: AsFd>(fd: &Fd, offset: u64, len: u64) -> io::Result<()> {
     let fd = fd.as_fd();
-    imp::syscalls::fcntl_rdadvise(fd, offset, len)
+    imp::fs::syscalls::fcntl_rdadvise(fd, offset, len)
 }
 
 /// `fcntl(fd, F_FULLFSYNC)`
@@ -22,5 +22,5 @@ pub fn fcntl_rdadvise<Fd: AsFd>(fd: &Fd, offset: u64, len: u64) -> io::Result<()
 #[inline]
 pub fn fcntl_fullfsync<Fd: AsFd>(fd: &Fd) -> io::Result<()> {
     let fd = fd.as_fd();
-    imp::syscalls::fcntl_fullfsync(fd)
+    imp::fs::syscalls::fcntl_fullfsync(fd)
 }

src/fs/fcopyfile.rs

@@ -25,7 +25,7 @@ pub unsafe fn fcopyfile<FromFd: AsFd, ToFd: AsFd>(
 ) -> io::Result<()> {
     let from = from.as_fd();
     let to = to.as_fd();
-    imp::syscalls::fcopyfile(from, to, state, flags)
+    imp::fs::syscalls::fcopyfile(from, to, state, flags)
 }
 
 /// `copyfile_state_alloc()`
@@ -36,7 +36,7 @@ pub unsafe fn fcopyfile<FromFd: AsFd, ToFd: AsFd>(
 /// [Apple]: https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/fcopyfile.3.html
 #[inline]
 pub fn copyfile_state_alloc() -> io::Result<copyfile_state_t> {
-    imp::syscalls::copyfile_state_alloc()
+    imp::fs::syscalls::copyfile_state_alloc()
 }
 
 /// `copyfile_state_free(state)`
@@ -52,7 +52,7 @@ pub fn copyfile_state_alloc() -> io::Result<copyfile_state_t> {
 /// [Apple]: https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/fcopyfile.3.html
 #[inline]
 pub unsafe fn copyfile_state_free(state: copyfile_state_t) -> io::Result<()> {
-    imp::syscalls::copyfile_state_free(state)
+    imp::fs::syscalls::copyfile_state_free(state)
 }
 
 /// `copyfile_state_get(state, COPYFILE_STATE_COPIED)`
@@ -68,7 +68,7 @@ pub unsafe fn copyfile_state_free(state: copyfile_state_t) -> io::Result<()> {
 /// [Apple]: https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/fcopyfile.3.html
 #[inline]
 pub unsafe fn copyfile_state_get_copied(state: copyfile_state_t) -> io::Result<u64> {
-    imp::syscalls::copyfile_state_get_copied(state)
+    imp::fs::syscalls::copyfile_state_get_copied(state)
 }
 
 /// `copyfile_state_get(state, flags, dst)`
@@ -88,5 +88,5 @@ pub unsafe fn copyfile_state_get(
     flag: u32,
     dst: *mut core::ffi::c_void,
 ) -> io::Result<()> {
-    imp::syscalls::copyfile_state_get(state, flag, dst)
+    imp::fs::syscalls::copyfile_state_get(state, flag, dst)
 }

src/fs/fd.rs

@@ -37,7 +37,7 @@ use imp::fs::{FlockOperation, Mode};
 #[inline]
 pub fn seek<Fd: AsFd>(fd: &Fd, pos: SeekFrom) -> io::Result<u64> {
     let fd = fd.as_fd();
-    imp::syscalls::seek(fd, pos)
+    imp::fs::syscalls::seek(fd, pos)
 }
 
 /// `lseek(fd, 0, SEEK_CUR)`—Returns the current position within a file.
@@ -55,7 +55,7 @@ pub fn seek<Fd: AsFd>(fd: &Fd, pos: SeekFrom) -> io::Result<u64> {
 #[inline]
 pub fn tell<Fd: AsFd>(fd: &Fd) -> io::Result<u64> {
     let fd = fd.as_fd();
-    imp::syscalls::tell(fd)
+    imp::fs::syscalls::tell(fd)
 }
 
 /// `fchmod(fd)`—Sets open file or directory permissions.
@@ -73,7 +73,7 @@ pub fn tell<Fd: AsFd>(fd: &Fd) -> io::Result<u64> {
 #[inline]
 pub fn fchmod<Fd: AsFd>(fd: &Fd, mode: Mode) -> io::Result<()> {
     let fd = fd.as_fd();
-    imp::syscalls::fchmod(fd, mode)
+    imp::fs::syscalls::fchmod(fd, mode)
 }
 
 /// `fchown(fd)`—Sets open file or directory ownership.
@@ -88,7 +88,7 @@ pub fn fchmod<Fd: AsFd>(fd: &Fd, mode: Mode) -> io::Result<()> {
 #[inline]
 pub fn fchown<Fd: AsFd>(fd: &Fd, owner: Uid, group: Gid) -> io::Result<()> {
     let fd = fd.as_fd();
-    imp::syscalls::fchown(fd, owner, group)
+    imp::fs::syscalls::fchown(fd, owner, group)
 }
 
 /// `fstat(fd)`—Queries metadata for an open file or directory.
@@ -107,7 +107,7 @@ pub fn fchown<Fd: AsFd>(fd: &Fd, owner: Uid, group: Gid) -> io::Result<()> {
 #[inline]
 pub fn fstat<Fd: AsFd>(fd: &Fd) -> io::Result<Stat> {
     let fd = fd.as_fd();
-    imp::syscalls::fstat(fd)
+    imp::fs::syscalls::fstat(fd)
 }
 
 /// `fstatfs(fd)`—Queries filesystem statistics for an open file or directory.
@@ -125,7 +125,7 @@ pub fn fstat<Fd: AsFd>(fd: &Fd) -> io::Result<Stat> {
 #[inline]
 pub fn fstatfs<Fd: AsFd>(fd: &Fd) -> io::Result<StatFs> {
     let fd = fd.as_fd();
-    imp::syscalls::fstatfs(fd)
+    imp::fs::syscalls::fstatfs(fd)
 }
 
 /// `futimens(fd, times)`—Sets timestamps for an open file or directory.
@@ -139,7 +139,7 @@ pub fn fstatfs<Fd: AsFd>(fd: &Fd) -> io::Result<StatFs> {
 #[inline]
 pub fn futimens<Fd: AsFd>(fd: &Fd, times: &Timestamps) -> io::Result<()> {
     let fd = fd.as_fd();
-    imp::syscalls::futimens(fd, times)
+    imp::fs::syscalls::futimens(fd, times)
 }
 
 /// `fallocate(fd, mode, offset, len)`—Adjusts file allocation.
@@ -168,7 +168,7 @@ pub fn futimens<Fd: AsFd>(fd: &Fd, times: &Timestamps) -> io::Result<()> {
 #[doc(alias = "posix_fallocate")]
 pub fn fallocate<Fd: AsFd>(fd: &Fd, mode: FallocateFlags, offset: u64, len: u64) -> io::Result<()> {
     let fd = fd.as_fd();
-    imp::syscalls::fallocate(fd, mode, offset, len)
+    imp::fs::syscalls::fallocate(fd, mode, offset, len)
 }
 
 /// `fcntl(fd, F_GETFL) & O_ACCMODE`
@@ -184,7 +184,7 @@ pub fn is_file_read_write<Fd: AsFd>(fd: &Fd) -> io::Result<(bool, bool)> {
 }
 
 pub(crate) fn _is_file_read_write(fd: BorrowedFd<'_>) -> io::Result<(bool, bool)> {
-    let mode = imp::syscalls::fcntl_getfl(fd)?;
+    let mode = imp::fs::syscalls::fcntl_getfl(fd)?;
 
     // Check for `O_PATH`.
     #[cfg(any(
@@ -223,7 +223,7 @@ pub(crate) fn _is_file_read_write(fd: BorrowedFd<'_>) -> io::Result<(bool, bool)
 #[inline]
 pub fn fsync<Fd: AsFd>(fd: &Fd) -> io::Result<()> {
     let fd = fd.as_fd();
-    imp::syscalls::fsync(fd)
+    imp::fs::syscalls::fsync(fd)
 }
 
 /// `fdatasync(fd)`—Ensures that file data is written to the underlying
@@ -244,7 +244,7 @@ pub fn fsync<Fd: AsFd>(fd: &Fd) -> io::Result<()> {
 #[inline]
 pub fn fdatasync<Fd: AsFd>(fd: &Fd) -> io::Result<()> {
     let fd = fd.as_fd();
-    imp::syscalls::fdatasync(fd)
+    imp::fs::syscalls::fdatasync(fd)
 }
 
 /// `ftruncate(fd, length)`—Sets the length of a file.
@@ -258,7 +258,7 @@ pub fn fdatasync<Fd: AsFd>(fd: &Fd) -> io::Result<()> {
 #[inline]
 pub fn ftruncate<Fd: AsFd>(fd: &Fd, length: u64) -> io::Result<()> {
     let fd = fd.as_fd();
-    imp::syscalls::ftruncate(fd, length)
+    imp::fs::syscalls::ftruncate(fd, length)
 }
 
 /// `flock(fd, operation)`—Acquire or release an advisory lock on an open file.
@@ -271,5 +271,5 @@ pub fn ftruncate<Fd: AsFd>(fd: &Fd, length: u64) -> io::Result<()> {
 #[inline]
 pub fn flock<Fd: AsFd>(fd: &Fd, operation: FlockOperation) -> io::Result<()> {
     let fd = fd.as_fd();
-    imp::syscalls::flock(fd, operation)
+    imp::fs::syscalls::flock(fd, operation)
 }

src/fs/getpath.rs

@@ -11,5 +11,5 @@ use imp::fd::AsFd;
 #[inline]
 pub fn getpath<Fd: AsFd>(fd: &Fd) -> io::Result<ZString> {
     let fd = fd.as_fd();
-    imp::syscalls::getpath(fd)
+    imp::fs::syscalls::getpath(fd)
 }