From daeaa58e7b1295c651a7ae11bcc5585436793b4d Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Mon, 19 May 2025 04:21:48 +0200 Subject: [PATCH] Fix formatting --- .../desktop_native/core/src/ipc/server.rs | 9 +++---- apps/desktop/desktop_native/napi/src/lib.rs | 25 +++++++++++-------- apps/desktop/desktop_native/proxy/src/main.rs | 13 +++++++--- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/apps/desktop/desktop_native/core/src/ipc/server.rs b/apps/desktop/desktop_native/core/src/ipc/server.rs index a9cae09833c..ffd0fb74e92 100644 --- a/apps/desktop/desktop_native/core/src/ipc/server.rs +++ b/apps/desktop/desktop_native/core/src/ipc/server.rs @@ -1,7 +1,4 @@ -use std::{ - error::Error, - path::PathBuf, -}; +use std::{error::Error, path::PathBuf}; use futures::{SinkExt, StreamExt, TryFutureExt}; @@ -84,9 +81,9 @@ impl Server { // Create the server and start listening for incoming connections // in a separate task to avoid blocking the current task let server = Server { - paths, + paths, cancel_token: cancel_token.clone(), - server_to_clients_send + server_to_clients_send, }; Ok(server) } diff --git a/apps/desktop/desktop_native/napi/src/lib.rs b/apps/desktop/desktop_native/napi/src/lib.rs index 5cc277d4fb1..eeecb6a3f06 100644 --- a/apps/desktop/desktop_native/napi/src/lib.rs +++ b/apps/desktop/desktop_native/napi/src/lib.rs @@ -438,11 +438,12 @@ pub mod ipc { let path = desktop_core::ipc::all_paths(&name); - let server = desktop_core::ipc::server::Server::start(path.clone(), send).map_err(|e| { - napi::Error::from_reason(format!( - "Error listening to server - Path: {path:?} - Error: {e} - {e:?}" - )) - })?; + let server = + desktop_core::ipc::server::Server::start(path.clone(), send).map_err(|e| { + napi::Error::from_reason(format!( + "Error listening to server - Path: {path:?} - Error: {e} - {e:?}" + )) + })?; Ok(IpcServer { server }) } @@ -452,7 +453,8 @@ pub mod ipc { pub fn get_paths(&self) -> Vec { self.server .paths - .iter().map(|p| p.to_string_lossy().to_string()) + .iter() + .map(|p| p.to_string_lossy().to_string()) .collect() } @@ -705,11 +707,12 @@ pub mod autofill { let path = desktop_core::ipc::path(&name); - let server = desktop_core::ipc::server::Server::start(vec![path.clone()], send).map_err(|e| { - napi::Error::from_reason(format!( - "Error listening to server - Path: {path:?} - Error: {e} - {e:?}" - )) - })?; + let server = desktop_core::ipc::server::Server::start(vec![path.clone()], send) + .map_err(|e| { + napi::Error::from_reason(format!( + "Error listening to server - Path: {path:?} - Error: {e} - {e:?}" + )) + })?; Ok(IpcServer { server }) } diff --git a/apps/desktop/desktop_native/proxy/src/main.rs b/apps/desktop/desktop_native/proxy/src/main.rs index 6925eda1522..c445e49903f 100644 --- a/apps/desktop/desktop_native/proxy/src/main.rs +++ b/apps/desktop/desktop_native/proxy/src/main.rs @@ -56,10 +56,15 @@ async fn main() { let should_foreground = windows::allow_foreground(); let sock_paths = desktop_core::ipc::all_paths("bitwarden"); - let sock_path = *sock_paths.iter().filter(|p| p.exists()).collect::>().first().unwrap_or_else(|| { - error!("No valid socket path found."); - std::process::exit(1); - }); + let sock_path = *sock_paths + .iter() + .filter(|p| p.exists()) + .collect::>() + .first() + .unwrap_or_else(|| { + error!("No valid socket path found."); + std::process::exit(1); + }); let log_path = { let mut path = sock_path.clone();