summaryrefslogtreecommitdiff
path: root/ext/net/io.rs
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2022-04-21 02:22:55 +0200
committerGitHub <noreply@github.com>2022-04-21 02:22:55 +0200
commit03019e778189b38938f1238f22652162de5a7434 (patch)
treecf16b44be07c1c488ffe4f31fe77eab7f6bd8c95 /ext/net/io.rs
parentaaaa877d91c5f8b88722fd1ec725791b0eb4efe0 (diff)
Revert various PRs related to "ext/http" (#14339)
* Revert "feat(ext/http): stream auto resp body compression (#14325)" * Revert "core: introduce `resource.read_return` (#14331)" * Revert "perf(http): optimize `ReadableStream`s backed by a resource (#14284)"
Diffstat (limited to 'ext/net/io.rs')
-rw-r--r--ext/net/io.rs16
1 files changed, 5 insertions, 11 deletions
diff --git a/ext/net/io.rs b/ext/net/io.rs
index 02caf7473..17b86af17 100644
--- a/ext/net/io.rs
+++ b/ext/net/io.rs
@@ -70,13 +70,13 @@ where
pub async fn read(
self: Rc<Self>,
mut buf: ZeroCopyBuf,
- ) -> Result<(usize, ZeroCopyBuf), AnyError> {
+ ) -> Result<usize, AnyError> {
let mut rd = self.rd_borrow_mut().await;
let nread = rd
.read(&mut buf)
.try_or_cancel(self.cancel_handle())
.await?;
- Ok((nread, buf))
+ Ok(nread)
}
pub async fn write(
@@ -103,10 +103,7 @@ impl Resource for TcpStreamResource {
"tcpStream".into()
}
- fn read_return(
- self: Rc<Self>,
- buf: ZeroCopyBuf,
- ) -> AsyncResult<(usize, ZeroCopyBuf)> {
+ fn read(self: Rc<Self>, buf: ZeroCopyBuf) -> AsyncResult<usize> {
Box::pin(self.read(buf))
}
@@ -163,7 +160,7 @@ impl UnixStreamResource {
pub async fn read(
self: Rc<Self>,
_buf: ZeroCopyBuf,
- ) -> Result<(usize, ZeroCopyBuf), AnyError> {
+ ) -> Result<usize, AnyError> {
unreachable!()
}
pub async fn write(
@@ -185,10 +182,7 @@ impl Resource for UnixStreamResource {
"unixStream".into()
}
- fn read_return(
- self: Rc<Self>,
- buf: ZeroCopyBuf,
- ) -> AsyncResult<(usize, ZeroCopyBuf)> {
+ fn read(self: Rc<Self>, buf: ZeroCopyBuf) -> AsyncResult<usize> {
Box::pin(self.read(buf))
}