DeCarabas/fwd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Clippy

Browse source
This commit is contained in:
John Doty 2024-08-06 06:51:03 -07:00
parent 1f19792c58
commit 9ef5515f01
1 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/client/mod.rs
View file

@ -62,7 +62,7 @@ async fn client_sync<S: AsyncRead + Unpin, T: AsyncRead + Unpin>(
} => result, } => result,
}; };
if let Err(_) = result { if result.is_err() {
// Something went wrong, let's just make sure we flush the client's // Something went wrong, let's just make sure we flush the client's
// stderr before we return. // stderr before we return.
_ = stderr.write_all(&buf[..]).await; _ = stderr.write_all(&buf[..]).await;
@ -121,7 +121,7 @@ async fn client_handle_connection(
0, // ..ho.. 0, // ..ho..
1, // ..st 1, // ..st
((port & 0xFF00) >> 8).try_into().unwrap(), // port (high) ((port & 0xFF00) >> 8).try_into().unwrap(), // port (high)
((port & 0x00FF) >> 0).try_into().unwrap(), // port (low) (port & 0x00FF).try_into().unwrap(), // port (low)
]; ];
dest_socket.write_all(&packet[..]).await?; dest_socket.write_all(&packet[..]).await?;
@ -306,14 +306,14 @@ async fn client_main<Reader: AsyncRead + Unpin, Writer: AsyncWrite + Unpin>(
} }
} => { } => {
if let Err(e) = result { if let Err(e) = result {
print!("Error sending refreshes\n"); println!("Error sending refreshes");
return Err(e.into()); return Err(e.into());
} }
}, },
result = client_handle_messages(reader, events) => { result = client_handle_messages(reader, events) => {
if let Err(e) = result { if let Err(e) = result {
print!("Error handling messages\n"); println!("Error handling messages");
return Err(e.into()); return Err(e);
} }
}, },
} }
@ -399,18 +399,14 @@ async fn client_connect_loop(
if let Err(e) = client_sync(&mut reader, &mut stderr).await { if let Err(e) = client_sync(&mut reader, &mut stderr).await {
error!("Error synchronizing: {:?}", e); error!("Error synchronizing: {:?}", e);
match child.wait().await { if let Ok(status) = child.wait().await {
Ok(status) => { if is_sigint(status) {
if is_sigint(status) { return;
return; } else if let Some(127) = status.code() {
} else { eprintln!(
match status.code() { "Cannot find `fwd` remotely, make sure it is installed"
Some(127) => eprintln!("Cannot find `fwd` remotely, make sure it is installed"), );
_ => (),
};
}
} }
Err(_) => (),
}; };
tokio::time::sleep(tokio::time::Duration::from_secs(3)).await; tokio::time::sleep(tokio::time::Duration::from_secs(3)).await;