s3s: http: keep_alive_body: fix lint (b3c99e69) · Commits · Public Repositories / s3s

crates/s3s/src/http/keep_alive_body.rs

+7 −14

Original line number	Diff line number	Diff line
		@@ -21,21 +21,12 @@ pin_project_lite::pin_project! {
		done: bool,
		}
		}
		impl<F> KeepAliveBody<F> {
		pub fn new(inner: F, interval: Duration) -> Self {
		Self {
		inner,
		initial_body: None,
		response: None,
		interval: tokio::time::interval(interval),
		done: false,
		}
		}

		pub fn with_initial_body(inner: F, initial_body: Bytes, interval: Duration) -> Self {
		impl<F> KeepAliveBody<F> {
		pub fn new(inner: F, interval: Duration, initial_body: Option<Bytes>) -> Self {
		Self {
		inner,
		initial_body: Some(initial_body),
		initial_body,
		response: None,
		interval: tokio::time::interval(interval),
		done: false,
		@@ -101,15 +92,15 @@ mod tests {

		#[tokio::test]
		async fn keep_alive_body() {
		let body = KeepAliveBody::with_initial_body(
		let body = KeepAliveBody::new(
		async {
		let mut res = Response::with_status(StatusCode::OK);
		res.body = Bytes::from_static(b" world").into();
		res.headers.insert("key", HeaderValue::from_static("value"));
		Ok(res)
		},
		Bytes::from_static(b"hello"),
		Duration::from_secs(1),
		Some(Bytes::from_static(b"hello")),
		);

		let aggregated = body.collect().await.unwrap();
		@@ -130,6 +121,7 @@ mod tests {
		Ok(res)
		},
		Duration::from_secs(1),
		None,
		);

		let aggregated = body.collect().await.unwrap();
		@@ -150,6 +142,7 @@ mod tests {
		Ok(res)
		},
		Duration::from_millis(10),
		None,
		);

		let aggregated = body.collect().await.unwrap();

+1 −1

Original line number	Diff line number	Diff line
		@@ -119,7 +119,7 @@ pub fn set_keep_alive_xml_body(
		let mut ser = xml::Serializer::new(&mut buf);
		ser.decl().map_err(S3Error::internal_error)?;

		res.body = Body::http_body(KeepAliveBody::with_initial_body(fut, buf.into(), duration));
		res.body = Body::http_body(KeepAliveBody::new(fut, duration, Some(buf.into())));
		res.headers.insert(hyper::header::CONTENT_TYPE, APPLICATION_XML);
		res.headers
		.insert(hyper::header::TRANSFER_ENCODING, TRANSFER_ENCODING_CHUNKED);