rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Propagate errors while writing out response instead of panicking.

This commit is contained in:
Jeb Rosen 2019-09-22 15:42:26 -07:00 committed by Sergio Benitez
parent 8718561bf8
commit 0d89637e8b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/lib/src/rocket.rs
View File

@ -92,12 +92,11 @@ fn hyper_service_fn(
}).expect("failed to spawn handler");
async move {
Ok(rx.await.expect("TODO.async: sender was dropped, error instead"))
rx.await.map_err(|e| io::Error::new(io::ErrorKind::Other, e))
}
}
impl Rocket {
// TODO.async: Reconsider io::Result
#[inline]
fn issue_response<'r>(
&self,
@ -151,7 +150,7 @@ impl Rocket {
let mut stream = body.into_chunk_stream(4096);
while let Some(next) = stream.next().await {
sender.send_data(next?).await.expect("TODO.async client gone?");
sender.send_data(next?).await.map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
}
}
Some(Body::Chunked(body, chunk_size)) => {
@ -162,7 +161,7 @@ impl Rocket {
let mut stream = body.into_chunk_stream(chunk_size.try_into().expect("u64 -> usize overflow"));
while let Some(next) = stream.next().await {
sender.send_data(next?).await.expect("TODO.async client gone?");
sender.send_data(next?).await.map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
}
}
};