appease some warnings

bytecodealliance · Dec 19, 2019 · 1963872 · 1963872
1 parent 819daea
commit 1963872
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 31 deletions.
diff --git a/crates/wasi-common/src/fdentry.rs b/crates/wasi-common/src/fdentry.rs
@@ -30,7 +30,7 @@ impl fmt::Debug for File {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             File::OsHandle(file) => write!(f, "{:?}", file),
-            File::VirtualFile(virt) => write!(f, "VirtualFile")
+            File::VirtualFile(_) => write!(f, "VirtualFile")
         }
     }
 }

diff --git a/crates/wasi-common/src/hostcalls_impl/fs.rs b/crates/wasi-common/src/hostcalls_impl/fs.rs
@@ -1120,7 +1120,7 @@ pub(crate) unsafe fn fd_readdir(
         .get_fd_entry_mut(fd)?
         .as_descriptor_mut(wasi::__WASI_RIGHTS_FD_READDIR, 0)?
         .as_file_mut()?;
-    let mut host_buf = dec_slice_of_mut_u8(memory, buf, buf_len)?;
+    let host_buf = dec_slice_of_mut_u8(memory, buf, buf_len)?;
 
     trace!("     | (buf,buf_len)={:?}", host_buf);
 

diff --git a/crates/wasi-common/src/hostcalls_impl/fs_helpers.rs b/crates/wasi-common/src/hostcalls_impl/fs_helpers.rs
@@ -5,8 +5,6 @@ use crate::{fdentry::File, fdentry::FdEntry, wasi, Error, Result};
 use std::path::{Component, Path};
 use crate::sys::fdentry_impl::OsHandle;
 
-use crate::virtfs::VirtualFile;
-
 #[derive(Debug)]
 pub(crate) struct PathGet {
     dirfd: File,
@@ -35,7 +33,7 @@ impl PathGet {
 
     pub(crate) fn open_with(self, read: bool, write: bool, oflags: u16, fs_flags: u16) -> Result<File> {
         match &self.dirfd {
-            File::OsHandle(file) => {
+            File::OsHandle(_) => {
 //                crate::sys::hostcalls_impl::path_create_directory(&file, &self.path)
                 crate::sys::hostcalls_impl::path_open(self, read, write, oflags, fs_flags)
                     .map_err(Into::into)

diff --git a/crates/wasi-common/src/sys/unix/hostcalls_impl/fs.rs b/crates/wasi-common/src/sys/unix/hostcalls_impl/fs.rs
@@ -74,8 +74,6 @@ pub(crate) fn path_link(resolved_old: PathGet, resolved_new: PathGet) -> Result<
 
     match (resolved_old.dirfd(), resolved_new.dirfd()) {
         (fdentry::File::OsHandle(resolved_old_file), fdentry::File::OsHandle(resolved_new_file)) => {
-            // Not setting AT_SYMLINK_FOLLOW fails on most filesystems
-            let atflags = libc::AT_SYMLINK_FOLLOW;
             unsafe {
                 linkat(
                     resolved_old_file.as_raw_fd(),
@@ -165,7 +163,7 @@ pub(crate) fn path_open(
                                     )
                                 }
                             }
-                            fdentry::File::VirtualFile(virt) => {
+                            fdentry::File::VirtualFile(_) => {
                                 unimplemented!("virt fstatat")
                             }
                         } {
@@ -191,7 +189,7 @@ pub(crate) fn path_open(
                                     AtFlag::SYMLINK_NOFOLLOW,
                                 )
                             },
-                            fdentry::File::VirtualFile(virt) => {
+                            fdentry::File::VirtualFile(_) => {
                                 unimplemented!("virt fstatat");
                             }
                         } {
@@ -229,7 +227,7 @@ pub(crate) fn path_readlink(resolved: PathGet, buf: &mut [u8]) -> Result<usize>
             .map_err(Into::into)
             .and_then(host_impl::path_from_host)?
         },
-        fdentry::File::VirtualFile(virt) => {
+        fdentry::File::VirtualFile(_) => {
             unimplemented!("virtual readlink");
         }
     };
@@ -297,7 +295,7 @@ pub(crate) fn path_filestat_get(
                 .map_err(Into::into)
                 .and_then(host_impl::filestat_from_nix)
         }
-        fdentry::File::VirtualFile(virt) => {
+        fdentry::File::VirtualFile(_) => {
             unimplemented!("virt path_filestat_get");
         }
     };
@@ -352,7 +350,7 @@ pub(crate) fn path_filestat_set_times(
             )
             .map_err(Into::into)
         }
-        fdentry::File::VirtualFile(virt) => {
+        fdentry::File::VirtualFile(_) => {
             unimplemented!("virt utimensat");
         }
     }
@@ -372,7 +370,7 @@ pub(crate) fn path_remove_directory(resolved: PathGet) -> Result<()> {
             }
             .map_err(Into::into)
         },
-        fdentry::File::VirtualFile(virt) => {
+        fdentry::File::VirtualFile(_) => {
             unimplemented!("virtual unlinkat")
         }
     }

diff --git a/crates/wasi-common/src/sys/unix/linux/hostcalls_impl.rs b/crates/wasi-common/src/sys/unix/linux/hostcalls_impl.rs
@@ -17,7 +17,7 @@ pub(crate) fn path_unlink_file(resolved: PathGet) -> Result<()> {
             }
             .map_err(Into::into)
         },
-        File::VirtualFile(virt) => {
+        File::VirtualFile(_) => {
             unimplemented!("virtual unlinkat");
         }
     }
@@ -40,7 +40,7 @@ pub(crate) fn path_symlink(old_path: &str, resolved: PathGet) -> Result<()> {
             }
             .map_err(Into::into)
         },
-        File::VirtualFile(virt) => {
+        File::VirtualFile(_) => {
             unimplemented!("virtual path_symlink");
         }
     }

diff --git a/crates/wasi-common/src/virtfs.rs b/crates/wasi-common/src/virtfs.rs
@@ -29,55 +29,55 @@ pub trait VirtualFile {
         Ok(())
     }
 
-    fn create_directory(&self, path: &Path) -> Result<()> {
+    fn create_directory(&self, _path: &Path) -> Result<()> {
         Err(Error::EACCES)
     }
 
-    fn readdir(&self, cookie: wasi::__wasi_dircookie_t) -> Result<Box<dyn Iterator<Item = Result<Dirent>>>> {
+    fn readdir(&self, _cookie: wasi::__wasi_dircookie_t) -> Result<Box<dyn Iterator<Item = Result<Dirent>>>> {
         Err(Error::EBADF)
     }
 
-    fn write_vectored(&mut self, iovs: &[io::IoSlice]) -> Result<usize> {
+    fn write_vectored(&mut self, _iovs: &[io::IoSlice]) -> Result<usize> {
         Err(Error::EBADF)
     }
 
-    fn pread(&self, buf: &mut [u8], offset: u64) -> Result<usize> {
+    fn pread(&self, _buf: &mut [u8], _offset: u64) -> Result<usize> {
         Err(Error::EBADF)
     }
 
-    fn pwrite(&self, buf: &mut [u8], offset: u64) -> Result<usize> {
+    fn pwrite(&self, _buf: &mut [u8], _offset: u64) -> Result<usize> {
         Err(Error::EBADF)
     }
 
-    fn seek(&mut self, offset: SeekFrom) -> Result<u64> {
+    fn seek(&mut self, _offset: SeekFrom) -> Result<u64> {
         Err(Error::EBADF)
     }
 
-    fn advise(&self, advice: wasi::__wasi_advice_t, offset: wasi::__wasi_filesize_t, len: wasi::__wasi_filesize_t) -> Result<()> {
+    fn advise(&self, _advice: wasi::__wasi_advice_t, _offset: wasi::__wasi_filesize_t, _len: wasi::__wasi_filesize_t) -> Result<()> {
         Err(Error::EBADF)
     }
 
-    fn allocate(&self, offset: wasi::__wasi_filesize_t, len: wasi::__wasi_filesize_t) -> Result<()> {
+    fn allocate(&self, _offset: wasi::__wasi_filesize_t, _len: wasi::__wasi_filesize_t) -> Result<()> {
         Err(Error::EBADF)
     }
 
     fn filestat_get(&self) -> Result<wasi::__wasi_filestat_t> {
         Err(Error::EBADF)
     }
 
-    fn filestat_set_times(&self, atim: Option<FileTime>, mtim: Option<FileTime>) -> Result<()> {
+    fn filestat_set_times(&self, _atim: Option<FileTime>, _mtim: Option<FileTime>) -> Result<()> {
         Err(Error::EBADF)
     }
 
-    fn filestat_set_size(&self, st_size: wasi::__wasi_filesize_t) -> Result<()> {
+    fn filestat_set_size(&self, _st_size: wasi::__wasi_filesize_t) -> Result<()> {
         Err(Error::EBADF)
     }
 
-    fn fdstat_set_flags(&self, fdflags: wasi::__wasi_fdflags_t) -> Result<()> {
+    fn fdstat_set_flags(&self, _fdflags: wasi::__wasi_fdflags_t) -> Result<()> {
         Err(Error::EBADF)
     }
 
-    fn read_vectored(&mut self, iovs: &mut [io::IoSliceMut]) -> Result<usize> {
+    fn read_vectored(&mut self, _iovs: &mut [io::IoSliceMut]) -> Result<usize> {
         Err(Error::EBADF)
     }
 
@@ -116,7 +116,7 @@ impl VirtualFile for InMemoryFile {
         ))
     }
 
-    fn readlinkat(&self, path: &Path) -> Result<String> {
+    fn readlinkat(&self, _path: &Path) -> Result<String> {
         // no symlink support, so always say it's invalid.
         Err(Error::EINVAL)
     }
@@ -163,7 +163,7 @@ impl VirtualFile for InMemoryFile {
         Ok(count)
     }
 
-    fn advise(&self, advice: wasi::__wasi_advice_t, offset: wasi::__wasi_filesize_t, len: wasi::__wasi_filesize_t) -> Result<()> {
+    fn advise(&self, advice: wasi::__wasi_advice_t, _offset: wasi::__wasi_filesize_t, _len: wasi::__wasi_filesize_t) -> Result<()> {
         // we'll just ignore advice for now, unless it's totally invalid
         match advice {
             wasi::__WASI_ADVICE_DONTNEED |
@@ -245,7 +245,7 @@ impl VirtualFile for VirtualDir {
     fn create_directory(&self, path: &Path) -> Result<()> {
         let mut entries = self.entries.borrow_mut();
         match entries.entry(path.to_owned()) {
-            Entry::Occupied(e) => Err(Error::EEXIST),
+            Entry::Occupied(_) => Err(Error::EEXIST),
             Entry::Vacant(v) => {
                 if self.writable {
                     println!("created new virtual directory at: {}", path.display());
@@ -258,7 +258,7 @@ impl VirtualFile for VirtualDir {
         }
     }
 
-    fn write_vectored(&mut self, iovs: &[io::IoSlice]) -> Result<usize> {
+    fn write_vectored(&mut self, _iovs: &[io::IoSlice]) -> Result<usize> {
         Err(Error::EBADF)
     }