From 6ac35fd24123b95f85255e44dc6554b73c77d0b7 Mon Sep 17 00:00:00 2001
From: Syrus Akbary <me@syrusakbary.com>
Date: Fri, 3 Mar 2023 19:17:32 -0800
Subject: [PATCH] Fix linting

---
 lib/api/src/access.rs         | 14 ++++++++++----
 lib/api/src/sys/mem_access.rs |  3 ++-
 lib/wasi/src/syscalls/mod.rs  |  4 ++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib/api/src/access.rs b/lib/api/src/access.rs
index e0d72b82c..da34c8ec4 100644
--- a/lib/api/src/access.rs
+++ b/lib/api/src/access.rs
@@ -12,8 +12,8 @@ pub(super) enum SliceCow<'a, T> {
 impl<'a, T> AsRef<[T]> for SliceCow<'a, T> {
     fn as_ref(&self) -> &[T] {
         match self {
-            Self::Borrowed(buf) => buf.as_ref(),
-            Self::Owned(buf, _) => buf.as_ref(),
+            Self::Borrowed(buf) => buf,
+            Self::Owned(buf, _) => buf,
         }
     }
 }
@@ -79,6 +79,11 @@ where
     pub fn len(&self) -> usize {
         self.buf.as_ref().len()
     }
+
+    /// If the slice is empty
+    pub fn is_empty(&self) -> bool {
+        self.buf.as_ref().is_empty()
+    }
 }
 
 impl<'a> WasmSliceAccess<'a, u8> {
@@ -96,7 +101,7 @@ where
 {
     fn drop(&mut self) {
         if let SliceCow::Owned(buf, modified) = &self.buf {
-            if *modified == true {
+            if *modified {
                 self.slice.write_slice(buf.as_ref()).ok();
             }
         }
@@ -168,6 +173,7 @@ where
 {
     /// Reads the address pointed to by this `WasmPtr` in a memory.
     #[inline]
+    #[allow(clippy::clone_on_copy)]
     pub fn read(&self) -> T
     where
         T: Clone,
@@ -191,7 +197,7 @@ where
 {
     fn drop(&mut self) {
         if let RefCow::Owned(val, modified) = &self.buf {
-            if *modified == true {
+            if *modified {
                 self.ptr.write(*val).ok();
             }
         }
diff --git a/lib/api/src/sys/mem_access.rs b/lib/api/src/sys/mem_access.rs
index 246c63797..239597eb2 100644
--- a/lib/api/src/sys/mem_access.rs
+++ b/lib/api/src/sys/mem_access.rs
@@ -111,7 +111,8 @@ impl<'a, T: ValueType> WasmRef<'a, T> {
     /// Writes to the location pointed to by this `WasmRef`.
     #[inline]
     pub fn write(self, val: T) -> Result<(), MemoryAccessError> {
-        Ok(self.access()?.write(val))
+        self.access()?.write(val);
+        Ok(())
     }
 
     /// Gains direct access to the memory of this slice
diff --git a/lib/wasi/src/syscalls/mod.rs b/lib/wasi/src/syscalls/mod.rs
index 420de3eab..685be1653 100644
--- a/lib/wasi/src/syscalls/mod.rs
+++ b/lib/wasi/src/syscalls/mod.rs
@@ -168,7 +168,7 @@ pub(crate) fn copy_from_slice<M: MemorySize>(
     let iovs_arr = iovs_arr.access().map_err(mem_error_to_wasi)?;
     for iovs in iovs_arr.iter() {
         let mut buf = WasmPtr::<u8, M>::new(iovs.buf)
-            .slice(&memory, iovs.buf_len)
+            .slice(memory, iovs.buf_len)
             .map_err(mem_error_to_wasi)?
             .access()
             .map_err(mem_error_to_wasi)?;
@@ -197,7 +197,7 @@ pub(crate) fn read_bytes<T: Read, M: MemorySize>(
     let iovs_arr = iovs_arr.access().map_err(mem_error_to_wasi)?;
     for iovs in iovs_arr.iter() {
         let mut buf = WasmPtr::<u8, M>::new(iovs.buf)
-            .slice(&memory, iovs.buf_len)
+            .slice(memory, iovs.buf_len)
             .map_err(mem_error_to_wasi)?
             .access()
             .map_err(mem_error_to_wasi)?;