From 1d862567337e9f51696e9abcc7595932f46d6bae Mon Sep 17 00:00:00 2001 From: Toshit Chawda Date: Wed, 2 Oct 2024 20:40:34 -0700 Subject: [PATCH] cargo fmt --- client/src/io_stream.rs | 7 ++++++- client/src/lib.rs | 10 ++++++++-- server/src/handle/wisp/twisp.rs | 5 ++++- server/src/route.rs | 2 +- wisp/src/inner.rs | 12 +++++++++--- 5 files changed, 28 insertions(+), 8 deletions(-) diff --git a/client/src/io_stream.rs b/client/src/io_stream.rs index e73fffd..35df5e9 100644 --- a/client/src/io_stream.rs +++ b/client/src/io_stream.rs @@ -152,7 +152,12 @@ impl EpoxyUdpStream { .map_err(|_| EpoxyError::InvalidPayload)? .0 .to_vec(); - Ok(self.tx.lock().await.send(BytesMut::from(payload.as_slice())).await?) + Ok(self + .tx + .lock() + .await + .send(BytesMut::from(payload.as_slice())) + .await?) } .await; diff --git a/client/src/lib.rs b/client/src/lib.rs index 278532a..67eaa23 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -533,7 +533,10 @@ impl EpoxyClient { url.scheme().ok_or(EpoxyError::InvalidUrlScheme)?; let host = url.host().ok_or(EpoxyError::NoUrlHost)?; - let port_str = url.port_u16().map(|x| format!(":{}", x)).unwrap_or_default(); + let port_str = url + .port_u16() + .map(|x| format!(":{}", x)) + .unwrap_or_default(); let request_method = object_get(&options, "method") .as_string() @@ -587,7 +590,10 @@ impl EpoxyClient { } headers_map.insert("Connection", HeaderValue::from_static("keep-alive")); headers_map.insert("User-Agent", HeaderValue::from_str(&self.user_agent)?); - headers_map.insert("Host", HeaderValue::from_str(&format!("{}{}", host, port_str))?); + headers_map.insert( + "Host", + HeaderValue::from_str(&format!("{}{}", host, port_str))?, + ); if let Some(content_type) = body_content_type { headers_map.insert("Content-Type", HeaderValue::from_str(&content_type)?); diff --git a/server/src/handle/wisp/twisp.rs b/server/src/handle/wisp/twisp.rs index 5a9e3e6..00363bc 100644 --- a/server/src/handle/wisp/twisp.rs +++ b/server/src/handle/wisp/twisp.rs @@ -10,7 +10,10 @@ use pty_process::{Pty, Size}; use tokio::{io::copy, process::Child, select, sync::Mutex}; use tokio_util::compat::{FuturesAsyncReadCompatExt, FuturesAsyncWriteCompatExt}; use wisp_mux::{ - extensions::{AnyProtocolExtension, ProtocolExtension, ProtocolExtensionBuilder, AnyProtocolExtensionBuilder}, + extensions::{ + AnyProtocolExtension, AnyProtocolExtensionBuilder, ProtocolExtension, + ProtocolExtensionBuilder, + }, ws::{LockedWebSocketWrite, WebSocketRead}, MuxStreamAsyncRead, MuxStreamAsyncWrite, WispError, }; diff --git a/server/src/route.rs b/server/src/route.rs index fc8e662..5f910e4 100644 --- a/server/src/route.rs +++ b/server/src/route.rs @@ -228,7 +228,7 @@ pub enum ServerRouteResult { impl Display for ServerRouteResult { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - match self { + match self { Self::Wisp(_) => write!(f, "Wisp"), Self::WsProxy(_, path, udp) => write!(f, "WsProxy path {:?} udp {:?}", path, udp), } diff --git a/wisp/src/inner.rs b/wisp/src/inner.rs index 7cdb330..301eacc 100644 --- a/wisp/src/inner.rs +++ b/wisp/src/inner.rs @@ -27,7 +27,7 @@ pub(crate) enum WsEvent { SendPong(Payload<'static>), WispMessage(Option>, Option>), EndFut(Option), - Noop + Noop, } struct MuxMapValue { @@ -316,10 +316,16 @@ impl MuxInner { } } WsEvent::SendPing(payload, channel) => { - let _ = channel.send(self.tx.write_frame(Frame::new(OpCode::Ping, payload, true)).await); + let _ = channel.send( + self.tx + .write_frame(Frame::new(OpCode::Ping, payload, true)) + .await, + ); } WsEvent::SendPong(payload) => { - self.tx.write_frame(Frame::new(OpCode::Pong, payload, true)).await?; + self.tx + .write_frame(Frame::new(OpCode::Pong, payload, true)) + .await?; } WsEvent::EndFut(x) => { if let Some(reason) = x {