chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Propagate errors instead of panicking.

Browse Source
This commit is contained in:
Jimmy Cuadra 2017-05-14 03:12:47 -07:00
parent 1d1ae0410e
commit 1a56b35f17
1 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/api.rs
View File

@ -40,32 +40,47 @@ impl ToTokens for Api {
#request_body_init_fields #request_body_init_fields
}; };
hyper_request.set_body( hyper_request.set_body(::serde_json::to_vec(&request_body)?);
::serde_json::to_vec(&request_body)
.expect("failed to serialize request body to JSON")
);
} }
} else { } else {
Tokens::new() Tokens::new()
}; };
let deserialize_response_body = if self.response.has_body_fields() { let deserialize_response_body = if self.response.has_body_fields() {
quote! { let mut tokens = Tokens::new();
let bytes = hyper_response.body().fold::<_, _, Result<_, ::hyper::Error>>(
Vec::new(), tokens.append(quote! {
|mut bytes, chunk| { hyper_response.body()
bytes.write_all(&chunk).expect("failed to append body chunk"); .fold::<_, _, Result<_, ::std::io::Error>>(Vec::new(), |mut bytes, chunk| {
bytes.write_all(&chunk)?;
Ok(bytes) Ok(bytes)
}).wait().expect("failed to read response body chunks into byte vector"); })
.map_err(::ruma_api::Error::from)
.and_then(|bytes| {
::serde_json::from_slice::<ResponseBody>(bytes.as_slice())
.map_err(::ruma_api::Error::from)
})
});
let response_body: ResponseBody = ::serde_json::from_slice(bytes.as_slice()) tokens.append(".and_then(|response_body| {");
.expect("failed to deserialize body");
} tokens
} else { } else {
Tokens::new() let mut tokens = Tokens::new();
tokens.append(quote! {
::futures::future::ok(())
});
tokens.append(".and_then(|_| {");
tokens
}; };
let mut closure_end = Tokens::new();
closure_end.append("})");
let response_init_fields = if self.response.has_fields() { let response_init_fields = if self.response.has_fields() {
self.response.init_fields() self.response.init_fields()
} else { } else {
@ -85,7 +100,7 @@ impl ToTokens for Api {
#request_types #request_types
impl ::std::convert::TryFrom<Request> for ::hyper::Request { impl ::std::convert::TryFrom<Request> for ::hyper::Request {
type Error = (); type Error = ::ruma_api::Error;
#[allow(unused_mut, unused_variables)] #[allow(unused_mut, unused_variables)]
fn try_from(request: Request) -> Result<Self, Self::Error> { fn try_from(request: Request) -> Result<Self, Self::Error> {
@ -93,7 +108,7 @@ impl ToTokens for Api {
let mut hyper_request = ::hyper::Request::new( let mut hyper_request = ::hyper::Request::new(
metadata.method, metadata.method,
metadata.path.parse().expect("failed to parse request URI"), metadata.path.parse()?,
); );
#add_body_to_request #add_body_to_request
@ -105,7 +120,7 @@ impl ToTokens for Api {
#response_types #response_types
impl ::std::convert::TryFrom<::hyper::Response> for Response { impl ::std::convert::TryFrom<::hyper::Response> for Response {
type Error = (); type Error = ::ruma_api::Error;
fn try_from(hyper_response: ::hyper::Response) -> Result<Self, Self::Error> { fn try_from(hyper_response: ::hyper::Response) -> Result<Self, Self::Error> {
#deserialize_response_body #deserialize_response_body
@ -115,6 +130,8 @@ impl ToTokens for Api {
}; };
Ok(response) Ok(response)
#closure_end
.wait()
} }
} }