Factor out the target_os = "wasi" check from the mm module.

Author: sunfishcode

src/imp/libc/mm/syscalls.rs

@@ -4,13 +4,11 @@ use super::super::c;
 #[cfg(any(target_os = "android", target_os = "linux"))]
 use super::super::conv::syscall_ret_owned_fd;
 use super::super::conv::{borrowed_fd, no_fd, ret};
-#[cfg(not(target_os = "wasi"))]
 use super::super::offset::libc_mmap;
-#[cfg(not(any(target_os = "redox", target_os = "wasi")))]
+#[cfg(not(target_os = "redox"))]
 use super::types::Advice;
 #[cfg(target_os = "linux")]
 use super::types::MremapFlags;
-#[cfg(not(target_os = "wasi"))]
 use super::types::{MapFlags, MprotectFlags, MsyncFlags, ProtFlags};
 #[cfg(any(target_os = "android", target_os = "linux"))]
 use super::types::{MlockFlags, UserfaultfdFlags};
@@ -19,7 +17,7 @@ use crate::io;
 #[cfg(any(target_os = "android", target_os = "linux"))]
 use crate::io::OwnedFd;
 
-#[cfg(not(any(target_os = "redox", target_os = "wasi")))]
+#[cfg(not(target_os = "redox"))]
 pub(crate) fn madvise(addr: *mut c::c_void, len: usize, advice: Advice) -> io::Result<()> {
     // On Linux platforms, `MADV_DONTNEED` has the same value as
     // `POSIX_MADV_DONTNEED` but different behavior. We remap it to a different
@@ -53,7 +51,6 @@ pub(crate) fn madvise(addr: *mut c::c_void, len: usize, advice: Advice) -> io::R
     }
 }
 
-#[cfg(not(target_os = "wasi"))]
 pub(crate) unsafe fn msync(addr: *mut c::c_void, len: usize, flags: MsyncFlags) -> io::Result<()> {
     let err = c::msync(addr, len, flags.bits());
 
@@ -69,7 +66,6 @@ pub(crate) unsafe fn msync(addr: *mut c::c_void, len: usize, flags: MsyncFlags)
 ///
 /// `mmap` is primarily unsafe due to the `addr` parameter, as anything working
 /// with memory pointed to by raw pointers is unsafe.
-#[cfg(not(target_os = "wasi"))]
 pub(crate) unsafe fn mmap(
     ptr: *mut c::c_void,
     len: usize,
@@ -97,7 +93,6 @@ pub(crate) unsafe fn mmap(
 ///
 /// `mmap` is primarily unsafe due to the `addr` parameter, as anything working
 /// with memory pointed to by raw pointers is unsafe.
-#[cfg(not(target_os = "wasi"))]
 pub(crate) unsafe fn mmap_anonymous(
     ptr: *mut c::c_void,
     len: usize,
@@ -119,7 +114,6 @@ pub(crate) unsafe fn mmap_anonymous(
     }
 }
 
-#[cfg(not(target_os = "wasi"))]
 pub(crate) unsafe fn mprotect(
     ptr: *mut c::c_void,
     len: usize,
@@ -128,7 +122,6 @@ pub(crate) unsafe fn mprotect(
     ret(c::mprotect(ptr, len, flags.bits()))
 }
 
-#[cfg(not(target_os = "wasi"))]
 pub(crate) unsafe fn munmap(ptr: *mut c::c_void, len: usize) -> io::Result<()> {
     ret(c::munmap(ptr, len))
 }
@@ -183,7 +176,6 @@ pub(crate) unsafe fn mremap_fixed(
 ///
 /// `mlock` operates on raw pointers and may round out to the nearest page
 /// boundaries.
-#[cfg(not(target_os = "wasi"))]
 #[inline]
 pub(crate) unsafe fn mlock(addr: *mut c::c_void, length: usize) -> io::Result<()> {
     ret(c::mlock(addr, length))
@@ -215,7 +207,6 @@ pub(crate) unsafe fn mlock_with(
 ///
 /// `munlock` operates on raw pointers and may round out to the nearest page
 /// boundaries.
-#[cfg(not(target_os = "wasi"))]
 #[inline]
 pub(crate) unsafe fn munlock(addr: *mut c::c_void, length: usize) -> io::Result<()> {
     ret(c::munlock(addr, length))

src/imp/libc/mm/types.rs

@@ -1,7 +1,6 @@
 use super::super::c;
 use bitflags::bitflags;
 
-#[cfg(not(target_os = "wasi"))]
 bitflags! {
     /// `PROT_*` flags for use with [`mmap`].
     ///
@@ -18,7 +17,6 @@ bitflags! {
     }
 }
 
-#[cfg(not(target_os = "wasi"))]
 bitflags! {
     /// `PROT_*` flags for use with [`mprotect`].
     ///
@@ -41,7 +39,6 @@ bitflags! {
     }
 }
 
-#[cfg(not(target_os = "wasi"))]
 bitflags! {
     /// `MAP_*` flags for use with [`mmap`].
     ///
@@ -228,7 +225,6 @@ bitflags! {
     }
 }
 
-#[cfg(not(target_os = "wasi"))]
 bitflags! {
     /// `MS_*` flags for use with [`msync`].
     ///
@@ -260,7 +256,7 @@ bitflags! {
 /// `POSIX_MADV_*` constants for use with [`madvise`].
 ///
 /// [`madvise`]: crate::mm::madvise
-#[cfg(not(any(target_os = "redox", target_os = "wasi")))]
+#[cfg(not(target_os = "redox"))]
 #[derive(Debug, Copy, Clone, Eq, PartialEq)]
 #[repr(i32)]
 #[non_exhaustive]

src/imp/libc/mod.rs

@@ -63,7 +63,7 @@ pub(crate) mod io;
 #[cfg(feature = "io_uring")]
 #[cfg_attr(doc_cfg, doc(cfg(feature = "io_uring")))]
 pub(crate) mod io_uring;
-#[cfg(not(windows))]
+#[cfg(not(any(windows, target_os = "wasi")))]
 #[cfg(any(feature = "mm", feature = "time", target_arch = "x86"))] // vdso.rs uses `madvise`
 pub(crate) mod mm;
 #[cfg(not(any(target_os = "redox", target_os = "wasi")))]

src/lib.rs

@@ -165,7 +165,7 @@ pub mod io;
 #[cfg(feature = "io_uring")]
 #[cfg_attr(doc_cfg, doc(cfg(feature = "io_uring")))]
 pub mod io_uring;
-#[cfg(not(windows))]
+#[cfg(not(any(windows, target_os = "wasi")))]
 #[cfg(feature = "mm")]
 #[cfg_attr(doc_cfg, doc(cfg(feature = "mm")))]
 pub mod mm;

src/mm/mod.rs

@@ -1,25 +1,21 @@
 //! Memory map operations.
 
-#[cfg(not(any(target_os = "redox", target_os = "wasi")))]
+#[cfg(not(target_os = "redox"))]
 mod madvise;
-#[cfg(not(target_os = "wasi"))]
 mod mmap;
-#[cfg(not(target_os = "wasi"))]
 mod msync;
 #[cfg(any(target_os = "android", target_os = "linux"))]
 mod userfaultfd;
 
-#[cfg(not(any(target_os = "redox", target_os = "wasi")))]
+#[cfg(not(target_os = "redox"))]
 pub use madvise::{madvise, Advice};
-#[cfg(not(target_os = "wasi"))]
 pub use mmap::{
     mlock, mmap, mmap_anonymous, mprotect, munlock, munmap, MapFlags, MprotectFlags, ProtFlags,
 };
 #[cfg(any(target_os = "android", target_os = "linux"))]
 pub use mmap::{mlock_with, MlockFlags};
 #[cfg(any(linux_raw, all(libc, target_os = "linux")))]
 pub use mmap::{mremap, mremap_fixed, MremapFlags};
-#[cfg(not(target_os = "wasi"))]
 pub use msync::{msync, MsyncFlags};
 #[cfg(any(target_os = "android", target_os = "linux"))]
 pub use userfaultfd::{userfaultfd, UserfaultfdFlags};