From 77a00ce1fb4ae2523e22b9b84ae09a0200502e38 Mon Sep 17 00:00:00 2001
From: Leo K <crowlkats@toaxl.com>
Date: Tue, 5 Oct 2021 22:38:27 +0200
Subject: chore: various op cleanup (#12329)

---
 ext/net/io.rs | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'ext/net/io.rs')

diff --git a/ext/net/io.rs b/ext/net/io.rs
index f1403679a..6a93b8cf6 100644
--- a/ext/net/io.rs
+++ b/ext/net/io.rs
@@ -2,7 +2,6 @@
 
 use crate::ops_tls as tls;
 use deno_core::error::not_supported;
-use deno_core::error::null_opbuf;
 use deno_core::error::AnyError;
 use deno_core::op_async;
 use deno_core::AsyncMutFuture;
@@ -166,16 +165,15 @@ impl Resource for UnixStreamResource {
 async fn op_read_async(
   state: Rc<RefCell<OpState>>,
   rid: ResourceId,
-  buf: Option<ZeroCopyBuf>,
+  mut buf: ZeroCopyBuf,
 ) -> Result<u32, AnyError> {
-  let buf = &mut buf.ok_or_else(null_opbuf)?;
   let resource = state.borrow().resource_table.get_any(rid)?;
   let nread = if let Some(s) = resource.downcast_rc::<TcpStreamResource>() {
-    s.read(buf).await?
+    s.read(&mut buf).await?
   } else if let Some(s) = resource.downcast_rc::<TlsStreamResource>() {
-    s.read(buf).await?
+    s.read(&mut buf).await?
   } else if let Some(s) = resource.downcast_rc::<UnixStreamResource>() {
-    s.read(buf).await?
+    s.read(&mut buf).await?
   } else {
     return Err(not_supported());
   };
@@ -185,16 +183,15 @@ async fn op_read_async(
 async fn op_write_async(
   state: Rc<RefCell<OpState>>,
   rid: ResourceId,
-  buf: Option<ZeroCopyBuf>,
+  buf: ZeroCopyBuf,
 ) -> Result<u32, AnyError> {
-  let buf = &buf.ok_or_else(null_opbuf)?;
   let resource = state.borrow().resource_table.get_any(rid)?;
   let nwritten = if let Some(s) = resource.downcast_rc::<TcpStreamResource>() {
-    s.write(buf).await?
+    s.write(&buf).await?
   } else if let Some(s) = resource.downcast_rc::<TlsStreamResource>() {
-    s.write(buf).await?
+    s.write(&buf).await?
   } else if let Some(s) = resource.downcast_rc::<UnixStreamResource>() {
-    s.write(buf).await?
+    s.write(&buf).await?
   } else {
     return Err(not_supported());
   };
-- 
cgit v1.2.3