forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style(lib): apply latest rustfmt

Browse Source
This commit is contained in:
Sean McArthur
2020-02-06 11:41:25 -08:00
parent 141207769f
commit dd02254ae8
7 changed files with 42 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
benches/end_to_end.rs
View File

@@ -337,16 +337,12 @@ fn spawn_server(rt: &mut tokio::runtime::Runtime, opts: &Opts) -> SocketAddr {
.http2_only(opts.http2) .http2_only(opts.http2)
.http2_initial_stream_window_size(opts.http2_stream_window) .http2_initial_stream_window_size(opts.http2_stream_window)
.http2_initial_connection_window_size(opts.http2_conn_window) .http2_initial_connection_window_size(opts.http2_conn_window)
.serve(make_service_fn(move |_| { .serve(make_service_fn(move |_| async move {
async move { Ok::<_, hyper::Error>(service_fn(move |req: Request<Body>| async move {
Ok::<_, hyper::Error>(service_fn(move |req: Request<Body>| { let mut req_body = req.into_body();
async move { while let Some(_chunk) = req_body.data().await {}
let mut req_body = req.into_body(); Ok::<_, hyper::Error>(Response::new(Body::from(body)))
while let Some(_chunk) = req_body.data().await {} }))
Ok::<_, hyper::Error>(Response::new(Body::from(body)))
}
}))
}
})) }))
}); });
let addr = srv.local_addr(); let addr = srv.local_addr();

10
benches/pipeline.rs
View File

@@ -25,12 +25,10 @@ fn hello_world(b: &mut test::Bencher) {
std::thread::spawn(move || { std::thread::spawn(move || {
let addr = "127.0.0.1:0".parse().unwrap(); let addr = "127.0.0.1:0".parse().unwrap();
let make_svc = make_service_fn(|_| { let make_svc = make_service_fn(|_| async {
async { Ok::<_, hyper::Error>(service_fn(|_| async {
Ok::<_, hyper::Error>(service_fn(|_| { Ok::<_, hyper::Error>(Response::new(Body::from("Hello, World!")))
async { Ok::<_, hyper::Error>(Response::new(Body::from("Hello, World!"))) } }))
}))
}
}); });
let mut rt = tokio::runtime::Builder::new() let mut rt = tokio::runtime::Builder::new()

24
benches/server.rs
View File

@@ -22,20 +22,16 @@ macro_rules! bench_server {
let (addr_tx, addr_rx) = mpsc::channel(); let (addr_tx, addr_rx) = mpsc::channel();
std::thread::spawn(move || { std::thread::spawn(move || {
let addr = "127.0.0.1:0".parse().unwrap(); let addr = "127.0.0.1:0".parse().unwrap();
let make_svc = make_service_fn(|_| { let make_svc = make_service_fn(|_| async {
async { Ok::<_, hyper::Error>(service_fn(|_| async {
Ok::<_, hyper::Error>(service_fn(|_| { Ok::<_, hyper::Error>(
async { Response::builder()
Ok::<_, hyper::Error>( .header($header.0, $header.1)
Response::builder() .header("content-type", "text/plain")
.header($header.0, $header.1) .body($body())
.header("content-type", "text/plain") .unwrap(),
.body($body()) )
.unwrap(), }))
)
}
}))
}
}); });
let mut rt = tokio::runtime::Builder::new() let mut rt = tokio::runtime::Builder::new()

8
examples/multi_server.rs
View File

@@ -23,12 +23,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
let addr1 = ([127, 0, 0, 1], 1337).into(); let addr1 = ([127, 0, 0, 1], 1337).into();
let addr2 = ([127, 0, 0, 1], 1338).into(); let addr2 = ([127, 0, 0, 1], 1338).into();
let srv1 = Server::bind(&addr1).serve(make_service_fn(|_| { let srv1 = Server::bind(&addr1).serve(make_service_fn(|_| async {
async { Ok::<_, hyper::Error>(service_fn(index1)) } Ok::<_, hyper::Error>(service_fn(index1))
})); }));
let srv2 = Server::bind(&addr2).serve(make_service_fn(|_| { let srv2 = Server::bind(&addr2).serve(make_service_fn(|_| async {
async { Ok::<_, hyper::Error>(service_fn(index2)) } Ok::<_, hyper::Error>(service_fn(index2))
})); }));
println!("Listening on http://{} and http://{}", addr1, addr2); println!("Listening on http://{} and http://{}", addr1, addr2);

4
examples/params.rs
View File

@@ -81,8 +81,8 @@ async fn main() -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
let addr = ([127, 0, 0, 1], 1337).into(); let addr = ([127, 0, 0, 1], 1337).into();
let server = Server::bind(&addr).serve(make_service_fn(|_| { let server = Server::bind(&addr).serve(make_service_fn(|_| async {
async { Ok::<_, hyper::Error>(service_fn(param_example)) } Ok::<_, hyper::Error>(service_fn(param_example))
})); }));
println!("Listening on http://{}", addr); println!("Listening on http://{}", addr);

18
tests/client.rs
View File

@@ -1745,11 +1745,9 @@ mod dispatch_impl {
.http2_only(true) .http2_only(true)
.serve_connection( .serve_connection(
socket, socket,
service_fn(|req| { service_fn(|req| async move {
async move { assert_eq!(req.headers().get("host"), None);
assert_eq!(req.headers().get("host"), None); Ok::<_, hyper::Error>(Response::new(Body::empty()))
Ok::<_, hyper::Error>(Response::new(Body::empty()))
}
}), }),
) )
.await .await
@@ -2397,12 +2395,10 @@ mod conn {
let server = Server::bind(&([127, 0, 0, 1], 0).into()) let server = Server::bind(&([127, 0, 0, 1], 0).into())
.http2_only(true) .http2_only(true)
.serve(make_service_fn(|_| { .serve(make_service_fn(|_| async move {
async move { Ok::<_, hyper::Error>(service_fn(|_req| {
Ok::<_, hyper::Error>(service_fn(|_req| { future::ok::<_, hyper::Error>(Response::new(Body::empty()))
future::ok::<_, hyper::Error>(Response::new(Body::empty())) }))
}))
}
})); }));
let addr = server.local_addr(); let addr = server.local_addr();
let (shdn_tx, shdn_rx) = oneshot::channel(); let (shdn_tx, shdn_rx) = oneshot::channel();

20
tests/server.rs
View File

@@ -1157,15 +1157,13 @@ async fn returning_1xx_response_is_error() {
Http::new() Http::new()
.serve_connection( .serve_connection(
socket, socket,
service_fn(|_| { service_fn(|_| async move {
async move { Ok::<_, hyper::Error>(
Ok::<_, hyper::Error>( Response::builder()
Response::builder() .status(StatusCode::CONTINUE)
.status(StatusCode::CONTINUE) .body(Body::empty())
.body(Body::empty()) .unwrap(),
.unwrap(), )
)
}
}), }),
) )
.await .await
@@ -1741,8 +1739,8 @@ async fn http2_service_poll_ready_error_sends_goaway() {
let server = hyper::Server::bind(&([127, 0, 0, 1], 0).into()) let server = hyper::Server::bind(&([127, 0, 0, 1], 0).into())
.http2_only(true) .http2_only(true)
.serve(make_service_fn(|_| { .serve(make_service_fn(|_| async move {
async move { Ok::<_, BoxError>(Http2ReadyErrorSvc) } Ok::<_, BoxError>(Http2ReadyErrorSvc)
})); }));
let addr_str = format!("http://{}", server.local_addr()); let addr_str = format!("http://{}", server.local_addr());