Re-format the code

pull/158/head
Daniel Abramov 4 years ago
parent 70eee45057
commit e848289667
  1. 6
      src/client.rs
  2. 14
      src/handshake/server.rs

@ -119,10 +119,8 @@ pub fn connect_with_config<Req: IntoClientRequest>(
} }
fn create_request(parts: &Parts, uri: &Uri) -> Request { fn create_request(parts: &Parts, uri: &Uri) -> Request {
let mut builder = Request::builder() let mut builder =
.uri(uri.clone()) Request::builder().uri(uri.clone()).method(parts.method.clone()).version(parts.version);
.method(parts.method.clone())
.version(parts.version);
*builder.headers_mut().expect("Failed to create `Request`") = parts.headers.clone(); *builder.headers_mut().expect("Failed to create `Request`") = parts.headers.clone();
builder.body(()).expect("Failed to create `Request`") builder.body(()).expect("Failed to create `Request`")
} }

@ -6,8 +6,9 @@ use std::{
result::Result as StdResult, result::Result as StdResult,
}; };
use http::{HeaderMap, Request as HttpRequest, Response as HttpResponse, StatusCode}; use http::{
use http::response::Builder; response::Builder, HeaderMap, Request as HttpRequest, Response as HttpResponse, StatusCode,
};
use httparse::Status; use httparse::Status;
use log::*; use log::*;
@ -75,7 +76,7 @@ fn create_parts<T>(request: &HttpRequest<T>) -> Result<Builder> {
.header("Connection", "Upgrade") .header("Connection", "Upgrade")
.header("Upgrade", "websocket") .header("Upgrade", "websocket")
.header("Sec-WebSocket-Accept", convert_key(key.as_bytes())?); .header("Sec-WebSocket-Accept", convert_key(key.as_bytes())?);
Ok(builder) Ok(builder)
} }
@ -84,8 +85,11 @@ pub fn create_response(request: &Request) -> Result<Response> {
Ok(create_parts(&request)?.body(())?) Ok(create_parts(&request)?.body(())?)
} }
/// Create a response for the request, with a custom body builder /// Create a response for the request with a custom body.
pub fn create_custom_response<T>(request: &HttpRequest<T>, generate_body: impl FnOnce() -> T) -> Result<HttpResponse<T>> { pub fn create_response_with_body<T>(
request: &HttpRequest<T>,
generate_body: impl FnOnce() -> T,
) -> Result<HttpResponse<T>> {
Ok(create_parts(&request)?.body(generate_body())?) Ok(create_parts(&request)?.body(generate_body())?)
} }

Loading…
Cancel
Save