From 2612b6f20fc21fb92402aa9086d13a7192ae3814 Mon Sep 17 00:00:00 2001 From: Divy Srivastava Date: Wed, 20 Apr 2022 22:09:13 +0530 Subject: core: introduce `resource.read_return` (#14331) --- ext/http/lib.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'ext/http') diff --git a/ext/http/lib.rs b/ext/http/lib.rs index dff5c14cb..b85dcc473 100644 --- a/ext/http/lib.rs +++ b/ext/http/lib.rs @@ -688,16 +688,13 @@ async fn op_http_write_resource( } }; - let mut vec = vec![0u8; 64 * 1024]; - let vec_ptr = vec.as_mut_ptr(); + let vec = vec![0u8; 64 * 1024]; // 64KB let buf = ZeroCopyBuf::new_temp(vec); - let nread = resource.clone().read(buf).await?; + let (nread, buf) = resource.clone().read_return(buf).await?; if nread == 0 { break; } - // SAFETY: ZeroCopyBuf keeps the Vec alive. - let bytes = - Bytes::from_static(unsafe { std::slice::from_raw_parts(vec_ptr, nread) }); + let bytes = Bytes::from(buf.to_temp()); match body_tx.send_data(bytes).await { Ok(_) => {} Err(err) => { -- cgit v1.2.3