Skip to content

Fix building on tvOS #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Un1q32 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix building on tvOS #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/fs/fd_flags.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,17 +90,15 @@ impl<T> GetSetFdFlags for T {
fd_flags.set(FdFlags::DSYNC, flags.contains(OFlags::DSYNC));
fd_flags.set(FdFlags::NONBLOCK, flags.contains(OFlags::NONBLOCK));
#[cfg(any(
target_os = "ios",
target_os = "macos",
target_vendor = "apple",
target_os = "freebsd",
target_os = "fuchsia"
))]
{
fd_flags.set(FdFlags::SYNC, flags.contains(OFlags::SYNC));
}
#[cfg(not(any(
target_os = "ios",
target_os = "macos",
target_vendor = "apple",
target_os = "freebsd",
target_os = "fuchsia"
)))]
Expand Down
26 changes: 11 additions & 15 deletions src/fs/file_io_ext.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ use crate::io::IoExt;
use io_lifetimes::AsFilelike;
#[cfg(not(any(
windows,
target_os = "ios",
target_os = "macos",
target_vendor = "apple",
target_os = "netbsd",
target_os = "openbsd",
target_os = "redox",
)))]
use rustix::fs::fadvise;
#[cfg(any(target_os = "ios", target_os = "macos"))]
#[cfg(target_vendor = "apple")]
use rustix::fs::fcntl_rdadvise;
#[cfg(not(any(
windows,
Expand All @@ -20,7 +19,7 @@ use rustix::fs::fcntl_rdadvise;
target_os = "openbsd"
)))]
use rustix::fs::{fallocate, FallocateFlags};
#[cfg(not(any(windows, target_os = "ios", target_os = "macos", target_os = "redox")))]
#[cfg(not(any(windows, target_vendor = "apple", target_os = "redox")))]
use rustix::io::{preadv, pwritev};
use std::io::{self, IoSlice, IoSliceMut, Seek, SeekFrom};
use std::slice;
Expand All @@ -32,8 +31,7 @@ use {rustix::fs::tell, rustix::fs::FileExt};
/// Advice to pass to `FileIoExt::advise`.
#[cfg(not(any(
windows,
target_os = "ios",
target_os = "macos",
target_vendor = "apple",
target_os = "netbsd",
target_os = "openbsd",
target_os = "redox"
Expand All @@ -58,8 +56,7 @@ pub enum Advice {
/// Advice to pass to `FileIoExt::advise`.
#[cfg(any(
windows,
target_os = "ios",
target_os = "macos",
target_vendor = "apple",
target_os = "netbsd",
target_os = "openbsd",
target_os = "redox"
Expand Down Expand Up @@ -404,8 +401,7 @@ fn advance_mut<'a, 'b>(bufs: &'b mut [IoSliceMut<'a>], n: usize) -> &'b mut [IoS
#[cfg(not(windows))]
impl<T: AsFilelike + IoExt> FileIoExt for T {
#[cfg(not(any(
target_os = "ios",
target_os = "macos",
target_vendor = "apple",
target_os = "netbsd",
target_os = "openbsd",
target_os = "redox"
Expand All @@ -423,7 +419,7 @@ impl<T: AsFilelike + IoExt> FileIoExt for T {
Ok(fadvise(self, offset, len, advice)?)
}

#[cfg(any(target_os = "ios", target_os = "macos"))]
#[cfg(target_vendor = "apple")]
#[inline]
fn advise(&self, offset: u64, len: u64, advice: Advice) -> io::Result<()> {
// Darwin lacks `posix_fadvise`, but does have an `fcntl_rdadvise`
Expand Down Expand Up @@ -480,13 +476,13 @@ impl<T: AsFilelike + IoExt> FileIoExt for T {
FileExt::read_exact_at(&*self.as_filelike_view::<std::fs::File>(), buf, offset)
}

#[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "redox")))]
#[cfg(not(any(target_vendor = "apple", target_os = "redox")))]
#[inline]
fn read_vectored_at(&self, bufs: &mut [IoSliceMut], offset: u64) -> io::Result<usize> {
Ok(preadv(self, bufs, offset)?)
}

#[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "redox")))]
#[cfg(not(any(target_vendor = "apple", target_os = "redox")))]
#[inline]
fn is_read_vectored_at(&self) -> bool {
true
Expand All @@ -512,13 +508,13 @@ impl<T: AsFilelike + IoExt> FileIoExt for T {
FileExt::write_all_at(&*self.as_filelike_view::<std::fs::File>(), buf, offset)
}

#[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "redox")))]
#[cfg(not(any(target_vendor = "apple", target_os = "redox")))]
#[inline]
fn write_vectored_at(&self, bufs: &[IoSlice], offset: u64) -> io::Result<usize> {
Ok(pwritev(self, bufs, offset)?)
}

#[cfg(not(any(target_os = "ios", target_os = "macos", target_os = "redox")))]
#[cfg(not(any(target_vendor = "apple", target_os = "redox")))]
#[inline]
fn is_write_vectored_at(&self) -> bool {
true
Expand Down
Loading