Merge pull request danburkert#21 from Mrmaxmeier/fix-stub

alexanderkjall · Aug 5, 2021 · 2406f2f · 2406f2f
2 parents 1737816 + 651ef08
commit 2406f2f
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,7 +7,7 @@ env:
 
 jobs:
   check:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -61,7 +61,7 @@ jobs:
       run: cargo test
 
   test-linux:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         target:
@@ -84,8 +84,29 @@ jobs:
     - name: Run tests
       run: cargo test
 
+  check-stub:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        target:
+          - wasm32-unknown-unknown
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Install toolchain
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        profile: minimal
+        target: ${{ matrix.target }}
+        override: true
+
+    - name: Run check
+      run: cargo check --all-targets --target ${{ matrix.target }}
+
   test-msrv:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
     - name: Checkout
       uses: actions/checkout@v2

diff --git a/src/lib.rs b/src/lib.rs
@@ -19,6 +19,8 @@ use crate::unix::MmapInner;
 #[cfg(not(any(unix, windows)))]
 mod stub;
 #[cfg(not(any(unix, windows)))]
+use crate::stub::file_len;
+#[cfg(not(any(unix, windows)))]
 use crate::stub::MmapInner;
 
 use std::fmt;
@@ -36,6 +38,9 @@ pub struct MmapRawDescriptor<'a>(&'a File);
 #[cfg(unix)]
 pub struct MmapRawDescriptor(std::os::unix::io::RawFd);
 
+#[cfg(not(any(unix, windows)))]
+pub struct MmapRawDescriptor<'a>(&'a File);
+
 pub trait MmapAsRawDesc {
     fn as_raw_desc(&self) -> MmapRawDescriptor;
 }
@@ -61,6 +66,13 @@ impl MmapAsRawDesc for std::os::unix::io::RawFd {
     }
 }
 
+#[cfg(not(any(unix, windows)))]
+impl MmapAsRawDesc for &File {
+    fn as_raw_desc(&self) -> MmapRawDescriptor {
+        MmapRawDescriptor(self)
+    }
+}
+
 /// A memory map builder, providing advanced options and flags for specifying memory map behavior.
 ///
 /// `MmapOptions` can be used to create an anonymous memory map using [`map_anon()`], or a

diff --git a/src/stub.rs b/src/stub.rs
@@ -15,23 +15,23 @@ impl MmapInner {
         ))
     }
 
-    pub fn map(_: usize, _: &File, _: u64) -> io::Result<MmapInner> {
+    pub fn map(_: usize, _: &File, _: u64, _: bool) -> io::Result<MmapInner> {
         MmapInner::new()
     }
 
-    pub fn map_exec(_: usize, _: &File, _: u64) -> io::Result<MmapInner> {
+    pub fn map_exec(_: usize, _: &File, _: u64, _: bool) -> io::Result<MmapInner> {
         MmapInner::new()
     }
 
-    pub fn map_mut(_: usize, _: &File, _: u64) -> io::Result<MmapInner> {
+    pub fn map_mut(_: usize, _: &File, _: u64, _: bool) -> io::Result<MmapInner> {
         MmapInner::new()
     }
 
-    pub fn map_copy(_: usize, _: &File, _: u64) -> io::Result<MmapInner> {
+    pub fn map_copy(_: usize, _: &File, _: u64, _: bool) -> io::Result<MmapInner> {
         MmapInner::new()
     }
 
-    pub fn map_copy_read_only(_: usize, _: &File, _: u64) -> io::Result<MmapInner> {
+    pub fn map_copy_read_only(_: usize, _: &File, _: u64, _: bool) -> io::Result<MmapInner> {
         MmapInner::new()
     }
 
@@ -74,3 +74,7 @@ impl MmapInner {
         unreachable!("self unconstructable");
     }
 }
+
+pub fn file_len(file: &File) -> io::Result<usize> {
+    Ok(file.metadata()?.len() as usize)
+}