From c413814ac4e5baa7a7545e99f0198714f5ac7242 Mon Sep 17 00:00:00 2001 From: Aiden McClelland Date: Wed, 9 Feb 2022 12:50:24 -0700 Subject: [PATCH] fix s9pk reader pos update --- backend/src/s9pk/reader.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/backend/src/s9pk/reader.rs b/backend/src/s9pk/reader.rs index 0de06472d..bcf395549 100644 --- a/backend/src/s9pk/reader.rs +++ b/backend/src/s9pk/reader.rs @@ -31,7 +31,7 @@ pub struct ReadHandle<'a, R: AsyncRead + AsyncSeek + Unpin = File> { impl<'a, R: AsyncRead + AsyncSeek + Unpin> ReadHandle<'a, R> { pub async fn to_vec(mut self) -> std::io::Result> { let mut buf = vec![0; self.rdr.limit() as usize]; - self.rdr.read_exact(&mut buf).await?; + self.read_exact(&mut buf).await?; Ok(buf) } } @@ -44,10 +44,9 @@ impl<'a, R: AsyncRead + AsyncSeek + Unpin> AsyncRead for ReadHandle<'a, R> { let start = buf.filled().len(); let this = self.project(); let pos = this.pos; - AsyncRead::poll_read(this.rdr, cx, buf).map(|res| { - **pos += (buf.filled().len() - start) as u64; - res - }) + let res = AsyncRead::poll_read(this.rdr, cx, buf); + **pos += (buf.filled().len() - start) as u64; + res } }