[update] Cargo fmt.

main
Shinyzenith 2 years ago
parent eab71d680d
commit 65e9649f87
No known key found for this signature in database
GPG Key ID: A3DFCDC66E9E2950

@ -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);
}
};
}

@ -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);

Loading…
Cancel
Save