Fix clippy warnings

src/client.rs

@@ -103,7 +103,7 @@ pub fn connect_with_config<Req: IntoClientRequest>(
     ) -> Result<(WebSocket<AutoStream>, Response)> {
         let uri = request.uri();
         let mode = uri_mode(uri)?;
-        let host = request.uri().host().ok_or_else(|| Error::Url(UrlErrorType::NoHostName))?;
+        let host = request.uri().host().ok_or(Error::Url(UrlErrorType::NoHostName))?;
         let port = uri.port_u16().unwrap_or(match mode {
             Mode::Plain => 80,
             Mode::Tls => 443,
@@ -165,7 +165,7 @@ pub fn connect<Req: IntoClientRequest>(request: Req) -> Result<(WebSocket<AutoSt
 }
 
 fn connect_to_some(addrs: &[SocketAddr], uri: &Uri, mode: Mode) -> Result<AutoStream> {
-    let domain = uri.host().ok_or_else(|| Error::Url(UrlErrorType::NoHostName))?;
+    let domain = uri.host().ok_or(Error::Url(UrlErrorType::NoHostName))?;
     for addr in addrs {
         debug!("Trying to contact {} at {}...", uri, addr);
         if let Ok(raw_stream) = TcpStream::connect(addr) {

src/handshake/client.rs

@@ -97,7 +97,7 @@ fn generate_request(request: Request, key: &str) -> Result<Vec<u8>> {
     let mut req = Vec::new();
     let uri = request.uri();
 
-    let authority = uri.authority().ok_or_else(|| Error::Url(UrlErrorType::NoHostName))?.as_str();
+    let authority = uri.authority().ok_or(Error::Url(UrlErrorType::NoHostName))?.as_str();
     let host = if let Some(idx) = authority.find('@') {
         // handle possible name:password@
         authority.split_at(idx + 1).1
@@ -119,8 +119,7 @@ fn generate_request(request: Request, key: &str) -> Result<Vec<u8>> {
          Sec-WebSocket-Key: {key}\r\n",
         version = request.version(),
         host = host,
-        path =
+        path = uri.path_and_query().ok_or(Error::Url(UrlErrorType::NoPathOrQuery))?.as_str(),
-            uri.path_and_query().ok_or_else(|| Error::Url(UrlErrorType::NoPathOrQuery))?.as_str(),
         key = key
     )
     .unwrap();

src/handshake/server.rs

@@ -68,7 +68,7 @@ fn create_parts<T>(request: &HttpRequest<T>) -> Result<Builder> {
     let key = request
         .headers()
         .get("Sec-WebSocket-Key")
-        .ok_or_else(|| Error::Protocol(ProtocolErrorType::MissingSecWebSocketKey))?;
+        .ok_or(Error::Protocol(ProtocolErrorType::MissingSecWebSocketKey))?;
 
     let builder = Response::builder()
         .status(StatusCode::SWITCHING_PROTOCOLS)