From 65e9649f87b09429ef530f4b5e87734e6463c527 Mon Sep 17 00:00:00 2001 From: Shinyzenith Date: Mon, 24 Jan 2022 04:00:18 +0530 Subject: [PATCH] [update] Cargo fmt. --- src/daemon.rs | 18 +++++++++--------- src/server.rs | 27 +++++++++++++-------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/src/daemon.rs b/src/daemon.rs index 68e6cdb..b61f39a 100644 --- a/src/daemon.rs +++ b/src/daemon.rs @@ -49,8 +49,8 @@ pub fn main() { //TODO: IMPLEMENT KEYBOARD EVENT GRAB - let mut conn = match LocalSocketStream::connect("/tmp/swhkd.sock"){ - Ok(conn) => {conn}, + let mut conn = match LocalSocketStream::connect("/tmp/swhkd.sock") { + Ok(conn) => conn, Err(e) => { log::error!("Unable to connect to hotkey server, is swhks running??"); log::error!("Error: {}", e); @@ -58,13 +58,13 @@ pub fn main() { } }; - match conn.write_all(args.value_of("shell").unwrap().as_bytes()){ - Ok(_) => {}, - Err(e) => { - log::error!("Unable to send command to hotkey server, is swhks running??"); - log::error!("Error: {}", e); - exit(1); - } + match conn.write_all(args.value_of("shell").unwrap().as_bytes()) { + Ok(_) => {} + Err(e) => { + log::error!("Unable to send command to hotkey server, is swhks running??"); + log::error!("Error: {}", e); + exit(1); + } }; } diff --git a/src/server.rs b/src/server.rs index 7f47e7a..1522457 100644 --- a/src/server.rs +++ b/src/server.rs @@ -1,7 +1,6 @@ use interprocess::local_socket::{LocalSocketListener, LocalSocketStream}; use std::{ - env, - fs, + env, fs, io::{self, prelude::*, BufReader}, path::Path, process::{exit, id, Command, Stdio}, @@ -80,23 +79,23 @@ fn main() { } } - let listener = match LocalSocketListener::bind(sockfile.clone()){ - Ok(listener) => {listener}, - Err(e) => { - log::error!("Failed to connect to {}", sockfile); - log::error!("Error: {}",e); - exit(1); - } + let listener = match LocalSocketListener::bind(sockfile.clone()) { + Ok(listener) => listener, + Err(e) => { + log::error!("Failed to connect to {}", sockfile); + log::error!("Error: {}", e); + exit(1); + } }; for conn in listener.incoming().filter_map(handle_error) { let mut conn = BufReader::new(conn); let mut buffer = String::new(); - match conn.read_line(&mut buffer){ - Ok(_) => {}, + match conn.read_line(&mut buffer) { + Ok(_) => {} Err(e) => { - log::error!("Failed to read incoming command from client."); - log::error!("Error: {}", e); - exit(1); + log::error!("Failed to read incoming command from client."); + log::error!("Error: {}", e); + exit(1); } }; log::debug!("Recieved command : {}", buffer);