diff --git a/src/client.rs b/src/client.rs index 9b13be9..70c157c 100644 --- a/src/client.rs +++ b/src/client.rs @@ -119,10 +119,8 @@ pub fn connect_with_config( } fn create_request(parts: &Parts, uri: &Uri) -> Request { - let mut builder = Request::builder() - .uri(uri.clone()) - .method(parts.method.clone()) - .version(parts.version); + let mut builder = + Request::builder().uri(uri.clone()).method(parts.method.clone()).version(parts.version); *builder.headers_mut().expect("Failed to create `Request`") = parts.headers.clone(); builder.body(()).expect("Failed to create `Request`") } diff --git a/src/handshake/server.rs b/src/handshake/server.rs index b832b0e..e60acb5 100644 --- a/src/handshake/server.rs +++ b/src/handshake/server.rs @@ -6,8 +6,9 @@ use std::{ result::Result as StdResult, }; -use http::{HeaderMap, Request as HttpRequest, Response as HttpResponse, StatusCode}; -use http::response::Builder; +use http::{ + response::Builder, HeaderMap, Request as HttpRequest, Response as HttpResponse, StatusCode, +}; use httparse::Status; use log::*; @@ -75,7 +76,7 @@ fn create_parts(request: &HttpRequest) -> Result { .header("Connection", "Upgrade") .header("Upgrade", "websocket") .header("Sec-WebSocket-Accept", convert_key(key.as_bytes())?); - + Ok(builder) } @@ -84,8 +85,11 @@ pub fn create_response(request: &Request) -> Result { Ok(create_parts(&request)?.body(())?) } -/// Create a response for the request, with a custom body builder -pub fn create_custom_response(request: &HttpRequest, generate_body: impl FnOnce() -> T) -> Result> { +/// Create a response for the request with a custom body. +pub fn create_response_with_body( + request: &HttpRequest, + generate_body: impl FnOnce() -> T, +) -> Result> { Ok(create_parts(&request)?.body(generate_body())?) }