H3: Code reformatting from fmt update

This commit is contained in:
stammw
2019-07-19 18:09:36 +02:00
committed by Benjamin Saunders
parent f173375cbc
commit e2ee96de60
3 changed files with 5 additions and 13 deletions
-1
View File
@@ -328,7 +328,6 @@ enum ProcessResponseState {
Finished,
}
fn build_certs(log: Logger, options: Opt) -> Result<(CertificateChain, Certificate, PrivateKey)> {
if let (Some(ref key_path), Some(ref cert_path)) = (options.key, options.cert) {
let key = fs::read(key_path).context("failed to read private key")?;
+3 -7
View File
@@ -11,7 +11,7 @@ use crate::{
connection::ConnectionRef,
frame::FrameStream,
headers::DecodeHeaders,
proto::frame::{DataFrame, HttpFrame, HeadersFrame},
proto::frame::{DataFrame, HeadersFrame, HttpFrame},
try_take, Error,
};
@@ -211,16 +211,12 @@ impl Stream for RecvBodyStream {
fn poll(&mut self) -> Poll<Option<Self::Item>, Self::Error> {
match try_ready!(self.recv.poll()) {
Some(HttpFrame::Data(d)) => {
Ok(Async::Ready(Some(d.payload)))
}
Some(HttpFrame::Data(d)) => Ok(Async::Ready(Some(d.payload))),
Some(HttpFrame::Headers(d)) => {
self.trailers = Some(d);
Ok(Async::Ready(None))
}
None => {
Ok(Async::Ready(None))
}
None => Ok(Async::Ready(None)),
_ => Err(Error::peer("invalid frame type in data")),
}
}
+2 -5
View File
@@ -10,14 +10,11 @@ use slog::{self, o, Logger};
use tokio_io::io::{Shutdown, WriteAll};
use crate::{
body::{Body, RecvBody, SendBody, RecvBodyStream},
body::{Body, RecvBody, RecvBodyStream, SendBody},
connection::{ConnectionDriver, ConnectionRef},
frame::{FrameDecoder, FrameStream},
headers::DecodeHeaders,
proto::{
frame::HttpFrame,
headers::Header,
},
proto::{frame::HttpFrame, headers::Header},
try_take, Error, Settings,
};