LemmyNet/pict-rs
2
0
Fork 0
mirror of https://git.asonix.dog/asonix/pict-rs synced 2024-12-22 11:21:24 +00:00
Code Releases Activity

Remove MessageBody impl

Browse source
This commit is contained in:
asonix 2024-02-22 16:15:32 -06:00
parent 3a7d5b7bfb
commit de356c1f12
1 changed files with 13 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/bytes_stream.rs
View file

@ -1,7 +1,4 @@
use actix_web::{ use actix_web::web::Bytes;
body::MessageBody,
web::{Bytes, BytesMut},
};
use futures_core::Stream; use futures_core::Stream;
use std::{ use std::{
collections::{vec_deque::IntoIter, VecDeque}, collections::{vec_deque::IntoIter, VecDeque},
@ -56,20 +53,6 @@ impl BytesStream {
self.total_len > 0 self.total_len > 0
} }
fn into_bytes(mut self) -> Bytes {
if self.inner.len() == 1 {
return self.inner.pop_front().expect("Exactly one");
}
let mut buf = BytesMut::with_capacity(self.total_len);
for bytes in self.inner {
buf.extend_from_slice(&bytes);
}
buf.freeze()
}
pub(crate) fn into_reader(self) -> BytesReader { pub(crate) fn into_reader(self) -> BytesReader {
BytesReader { BytesReader {
index: 0, index: 0,
@ -78,12 +61,12 @@ impl BytesStream {
} }
pub(crate) fn into_io_stream(self) -> IoStream { pub(crate) fn into_io_stream(self) -> IoStream {
IoStream { stream: self } IoStream { inner: self.inner }
} }
} }
pub(crate) struct IoStream { pub(crate) struct IoStream {
stream: BytesStream, inner: VecDeque<Bytes>,
} }
pub(crate) struct BytesReader { pub(crate) struct BytesReader {
@ -100,45 +83,27 @@ impl IntoIterator for BytesStream {
} }
} }
impl MessageBody for BytesStream {
type Error = std::io::Error;
fn size(&self) -> actix_web::body::BodySize {
if let Ok(len) = self.len().try_into() {
actix_web::body::BodySize::Sized(len)
} else {
actix_web::body::BodySize::None
}
}
fn poll_next(
self: Pin<&mut Self>,
_: &mut Context<'_>,
) -> Poll<Option<Result<Bytes, Self::Error>>> {
Poll::Ready(self.get_mut().inner.pop_front().map(Ok))
}
fn try_into_bytes(self) -> Result<Bytes, Self>
where
Self: Sized,
{
Ok(self.into_bytes())
}
}
impl Stream for BytesStream { impl Stream for BytesStream {
type Item = Result<Bytes, Infallible>; type Item = Result<Bytes, Infallible>;
fn poll_next(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Option<Self::Item>> { fn poll_next(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Option<Self::Item>> {
Poll::Ready(self.get_mut().inner.pop_front().map(Ok)) Poll::Ready(self.get_mut().inner.pop_front().map(Ok))
} }
fn size_hint(&self) -> (usize, Option<usize>) {
(self.inner.len(), Some(self.inner.len()))
}
} }
impl Stream for IoStream { impl Stream for IoStream {
type Item = std::io::Result<Bytes>; type Item = std::io::Result<Bytes>;
fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> { fn poll_next(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Option<Self::Item>> {
MessageBody::poll_next(Pin::new(&mut self.get_mut().stream), cx) Poll::Ready(self.get_mut().inner.pop_front().map(Ok))
}
fn size_hint(&self) -> (usize, Option<usize>) {
(self.inner.len(), Some(self.inner.len()))
} }
} }