actix/actix-extras
1
0
Fork 0
mirror of https://github.com/actix/actix-extras.git synced 2024-11-24 16:02:59 +01:00
Code Issues Releases Wiki Activity

make streaming method more ergonomic

Browse Source
This commit is contained in:
Nikolay Kim 2018-03-21 19:14:18 -07:00
parent 2d75ced4ed
commit 4866a26578
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/client/request.rs
View File

@ -5,9 +5,10 @@ use std::time::Duration;
use actix::{Addr, Unsync}; use actix::{Addr, Unsync};
use cookie::{Cookie, CookieJar}; use cookie::{Cookie, CookieJar};
use bytes::{BytesMut, BufMut}; use bytes::{Bytes, BytesMut, BufMut};
use http::{uri, HeaderMap, Method, Version, Uri, HttpTryFrom, Error as HttpError}; use http::{uri, HeaderMap, Method, Version, Uri, HttpTryFrom, Error as HttpError};
use http::header::{self, HeaderName, HeaderValue}; use http::header::{self, HeaderName, HeaderValue};
use futures::Stream;
use serde_json; use serde_json;
use serde::Serialize; use serde::Serialize;
use percent_encoding::{USERINFO_ENCODE_SET, percent_encode}; use percent_encoding::{USERINFO_ENCODE_SET, percent_encode};
@ -591,6 +592,16 @@ impl ClientRequestBuilder {
Ok(self.body(body)?) Ok(self.body(body)?)
} }
/// Set a streaming body and generate `ClientRequest`.
///
/// `ClientRequestBuilder` can not be used after this call.
pub fn streaming<S, E>(&mut self, stream: S) -> Result<ClientRequest, HttpError>
where S: Stream<Item=Bytes, Error=E> + 'static,
E: Into<Error>,
{
self.body(Body::Streaming(Box::new(stream.map_err(|e| e.into()))))
}
/// Set an empty body and generate `ClientRequest` /// Set an empty body and generate `ClientRequest`
/// ///
/// `ClientRequestBuilder` can not be used after this call. /// `ClientRequestBuilder` can not be used after this call.

7
src/httpresponse.rs
View File

@ -516,10 +516,11 @@ impl HttpResponseBuilder {
/// Set a streaming body and generate `HttpResponse`. /// Set a streaming body and generate `HttpResponse`.
/// ///
/// `HttpResponseBuilder` can not be used after this call. /// `HttpResponseBuilder` can not be used after this call.
pub fn streaming<S>(&mut self, stream: S) -> Result<HttpResponse, HttpError> pub fn streaming<S, E>(&mut self, stream: S) -> Result<HttpResponse, HttpError>
where S: Stream<Item=Bytes, Error=Error> + 'static, where S: Stream<Item=Bytes, Error=E> + 'static,
E: Into<Error>,
{ {
self.body(Body::Streaming(Box::new(stream))) self.body(Body::Streaming(Box::new(stream.map_err(|e| e.into()))))
} }
/// Set a json body and generate `HttpResponse` /// Set a json body and generate `HttpResponse`