Merge pull request #157 from sinkingsugar/master

Add visionOS support

Author: de-vri-es

.github/workflows/main.yml

@@ -115,6 +115,20 @@ jobs:
     - name: Run check
       run: cargo check --all-features --target wasm32-unknown-unknown
 
+  check-visionos:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Install toolchain
+      uses: dtolnay/rust-toolchain@nightly
+      with:
+        components: rust-src
+
+    - name: Run check
+      run: cargo check --all-features --target aarch64-apple-visionos -Zbuild-std
+
   test-msrv:
     runs-on: ubuntu-latest
     steps:

src/advice.rs

@@ -230,7 +230,7 @@ pub enum Advice {
     /// zeroed out if the address range is deallocated without first unwiring the pages (i.e.
     /// a munmap(2) without a preceding munlock(2) or the application quits).  This is used
     /// with `madvise()` system call.
-    #[cfg(any(target_os = "macos", target_os = "ios"))]
+    #[cfg(target_vendor = "apple")]
     ZeroWiredPages = libc::MADV_ZERO_WIRED_PAGES,
 }
 
@@ -319,7 +319,7 @@ pub enum UncheckedAdvice {
     /// Using the returned value with conceptually write to the
     /// mapped pages, i.e. borrowing the mapping while the pages
     /// are still being freed results in undefined behaviour.
-    #[cfg(any(target_os = "linux", target_os = "macos", target_os = "ios"))]
+    #[cfg(any(target_os = "linux", target_vendor = "apple"))]
     Free = libc::MADV_FREE,
 
     /// **MADV_REMOVE** - Linux only (since Linux 2.6.16)
@@ -358,7 +358,7 @@ pub enum UncheckedAdvice {
     /// Using the returned value with conceptually write to the
     /// mapped pages, i.e. borrowing the mapping while the pages
     /// are still being freed results in undefined behaviour.
-    #[cfg(any(target_os = "macos", target_os = "ios"))]
+    #[cfg(target_vendor = "apple")]
     FreeReusable = libc::MADV_FREE_REUSABLE,
 
     /// **MADV_FREE_REUSE** - Darwin only
@@ -372,7 +372,7 @@ pub enum UncheckedAdvice {
     /// Using the returned value with conceptually write to the
     /// mapped pages, i.e. borrowing the mapping while the pages
     /// are still being freed results in undefined behaviour.
-    #[cfg(any(target_os = "macos", target_os = "ios"))]
+    #[cfg(target_vendor = "apple")]
     FreeReuse = libc::MADV_FREE_REUSE,
 }
 

src/lib.rs

@@ -368,7 +368,7 @@ impl MmapOptions {
     /// This option requests that no swap space will be allocated for the memory map,
     /// which can be useful for extremely large maps that are only written to sparsely.
     ///
-    /// This option is currently supported on Linux, Android, macOS, iOS, NetBSD, Solaris and Illumos.
+    /// This option is currently supported on Linux, Android, Apple platforms (macOS, iOS, visionOS, etc.), NetBSD, Solaris and Illumos.
     /// On those platforms, this option corresponds to the `MAP_NORESERVE` flag.
     /// On Linux, this option is ignored if [`vm.overcommit_memory`](https://www.kernel.org/doc/Documentation/vm/overcommit-accounting) is set to 2.
     ///

src/unix.rs

@@ -45,7 +45,7 @@ const MAP_HUGE_SHIFT: libc::c_int = 0;
 #[cfg(any(
     target_os = "linux",
     target_os = "android",
-    target_os = "macos",
+    target_vendor = "apple",
     target_os = "netbsd",
     target_os = "solaris",
     target_os = "illumos",
@@ -55,7 +55,7 @@ const MAP_NORESERVE: libc::c_int = libc::MAP_NORESERVE;
 #[cfg(not(any(
     target_os = "linux",
     target_os = "android",
-    target_os = "macos",
+    target_vendor = "apple",
     target_os = "netbsd",
     target_os = "solaris",
     target_os = "illumos",