Skip to content

net-utils: Resolve Rust 1.88 clippy lints and format strings #7045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
steviez merged 2 commits into from
Jul 20, 2025
Merged

net-utils: Resolve Rust 1.88 clippy lints and format strings #7045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47e8c5e
Cargo clippy with Rust 1.88
steviez Jul 18, 2025
8464b8d
Cargo fmt with format_strings = true
steviez Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 19 additions & 20 deletions net-utils/src/ip_echo_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,20 @@ fn parse_response(
[b'H', b'T', b'T', b'P'] => {
let http_response = std::str::from_utf8(body);
match http_response {
Ok(r) => bail!("Invalid gossip entrypoint. {ip_echo_server_addr} looks to be an HTTP port replying with {r}"),
Err(_) => bail!("Invalid gossip entrypoint. {ip_echo_server_addr} looks to be an HTTP port."),
Ok(r) => bail!(
"Invalid gossip entrypoint. {ip_echo_server_addr} looks to be an HTTP port \
replying with {r}"
),
Err(_) => bail!(
"Invalid gossip entrypoint. {ip_echo_server_addr} looks to be an HTTP port."
),
}
}
_ => {
bail!("Invalid gossip entrypoint. {ip_echo_server_addr} provided unexpected header bytes {response_header:?} ");
bail!(
"Invalid gossip entrypoint. {ip_echo_server_addr} provided unexpected header \
bytes {response_header:?} "
);
}
};
Ok(payload)
Expand Down Expand Up @@ -163,7 +171,7 @@ pub(crate) async fn verify_all_reachable_tcp(
bind_address,
)
.await
.map_err(|err| warn!("ip_echo_server request failed: {}", err));
.map_err(|err| warn!("ip_echo_server request failed: {err}"));

// spawn checker to wait for reply
// since we do not know if tcp_listeners are nonblocking, we have to run them in native threads.
Expand All @@ -173,7 +181,7 @@ pub(crate) async fn verify_all_reachable_tcp(

// Use blocking API since we have no idea if sockets given to us are nonblocking or not
let thread_handle = tokio::task::spawn_blocking(move || {
debug!("Waiting for incoming connection on tcp/{}", port);
debug!("Waiting for incoming connection on tcp/{port}");
match tcp_listener.incoming().next() {
Some(_) => {
// ignore errors here since this can only happen if a timeout was detected.
Expand Down Expand Up @@ -250,10 +258,7 @@ pub(crate) async fn verify_all_reachable_udp(
for (bind_ip, ports_to_socks_map) in ip_to_ports {
let ports: Vec<u16> = ports_to_socks_map.keys().copied().collect();

info!(
"Checking that udp ports {:?} are reachable from bind IP {:?}",
ports, bind_ip
);
info!("Checking that udp ports {ports:?} are reachable from bind IP {bind_ip:?}");

'outer: for chunk_to_check in ports.chunks(MAX_PORT_COUNT_PER_MESSAGE) {
let ports_to_check = chunk_to_check.to_vec();
Expand All @@ -275,7 +280,7 @@ pub(crate) async fn verify_all_reachable_udp(
bind_ip,
)
.await
.map_err(|err| warn!("ip_echo_server request failed: {}", err));
.map_err(|err| warn!("ip_echo_server request failed: {err}"));

let reachable_ports = Arc::new(RwLock::new(HashSet::new()));
// Spawn threads for each socket to check
Expand All @@ -300,10 +305,7 @@ pub(crate) async fn verify_all_reachable_udp(
}

let recv_result = socket.recv(&mut [0; 1]);
debug!(
"Waited for incoming datagram on udp/{}: {:?}",
port, recv_result
);
debug!("Waited for incoming datagram on udp/{port}: {recv_result:?}");

if recv_result.is_ok() {
reachable_ports.write().unwrap().insert(port);
Expand All @@ -327,18 +329,15 @@ pub(crate) async fn verify_all_reachable_udp(
.into_inner()
.expect("No threads should hold the lock");
info!(
"checked udp ports: {:?}, reachable udp ports: {:?}",
ports_to_check, reachable_ports
"checked udp ports: {ports_to_check:?}, reachable udp ports: \
{reachable_ports:?}"
);
if reachable_ports.len() == ports_to_check.len() {
continue 'outer; // starts checking next chunk of ports, if any
}
}

error!(
"Maximum retry count reached. Some ports for IP {} unreachable.",
bind_ip
);
error!("Maximum retry count reached. Some ports for IP {bind_ip} unreachable.");
return false;
}
}
Expand Down
18 changes: 9 additions & 9 deletions net-utils/src/ip_echo_server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ async fn process_connection(
peer_addr: SocketAddr,
shred_version: Option<u16>,
) -> io::Result<()> {
info!("connection from {:?}", peer_addr);
info!("connection from {peer_addr:?}");

let mut data = vec![0u8; ip_echo_server_request_length()];

Expand Down Expand Up @@ -104,7 +104,7 @@ async fn process_connection(
))
})?;

trace!("request: {:?}", msg);
trace!("request: {msg:?}");

// Fire a datagram at each non-zero UDP port
match bind_to_unspecified() {
Expand All @@ -114,21 +114,21 @@ async fn process_connection(
let result =
udp_socket.send_to(&[0], SocketAddr::from((peer_addr.ip(), *udp_port)));
match result {
Ok(_) => debug!("Successful send_to udp/{}", udp_port),
Err(err) => info!("Failed to send_to udp/{}: {}", udp_port, err),
Ok(_) => debug!("Successful send_to udp/{udp_port}"),
Err(err) => info!("Failed to send_to udp/{udp_port}: {err}"),
}
}
}
}
Err(err) => {
warn!("Failed to bind local udp socket: {}", err);
warn!("Failed to bind local udp socket: {err}");
}
}

// Try to connect to each non-zero TCP port
for tcp_port in &msg.tcp_ports {
if *tcp_port != 0 {
debug!("Connecting to tcp/{}", tcp_port);
debug!("Connecting to tcp/{tcp_port}");

let mut tcp_stream = timeout(
IO_TIMEOUT,
Expand All @@ -148,7 +148,7 @@ async fn process_connection(
// conflict with the first four bytes of a valid HTTP response.
let mut bytes = vec![0u8; IP_ECHO_SERVER_RESPONSE_LENGTH];
bincode::serialize_into(&mut bytes[HEADER_LENGTH..], &response).unwrap();
trace!("response: {:?}", bytes);
trace!("response: {bytes:?}");
writer.write_all(&bytes).await
}

Expand All @@ -163,11 +163,11 @@ async fn run_echo_server(tcp_listener: std::net::TcpListener, shred_version: Opt
Ok((socket, peer_addr)) => {
runtime::Handle::current().spawn(async move {
if let Err(err) = process_connection(socket, peer_addr, shred_version).await {
info!("session failed: {:?}", err);
info!("session failed: {err:?}");
}
});
}
Err(err) => warn!("listener accept failed: {:?}", err),
Err(err) => warn!("listener accept failed: {err:?}"),
}
}
}
Expand Down
13 changes: 7 additions & 6 deletions net-utils/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,8 +366,8 @@ pub fn multi_bind_in_range_with_config(
if !PLATFORM_SUPPORTS_SOCKET_CONFIGS && num != 1 {
// See https://github.com/solana-labs/solana/issues/4607
warn!(
"multi_bind_in_range_with_config() only supports 1 socket on this platform ({} requested)",
num
"multi_bind_in_range_with_config() only supports 1 socket on this platform ({num} \
requested)"
);
num = 1;
}
Expand Down Expand Up @@ -464,7 +464,8 @@ pub fn bind_common_with_config(

#[deprecated(
since = "2.3.2",
note = "Please avoid this function, in favor of sockets::bind_two_in_range_with_offset_and_config"
note = "Please avoid this function, in favor of \
sockets::bind_two_in_range_with_offset_and_config"
)]
#[allow(deprecated)]
pub fn bind_two_in_range_with_offset(
Expand All @@ -484,7 +485,8 @@ pub fn bind_two_in_range_with_offset(

#[deprecated(
since = "2.3.2",
note = "Please avoid this function, in favor of sockets::bind_two_in_range_with_offset_and_config"
note = "Please avoid this function, in favor of \
sockets::bind_two_in_range_with_offset_and_config"
)]
#[allow(deprecated)]
pub fn bind_two_in_range_with_offset_and_config(
Expand Down Expand Up @@ -582,8 +584,7 @@ pub fn bind_more_with_config(
if !PLATFORM_SUPPORTS_SOCKET_CONFIGS {
if num > 1 {
warn!(
"bind_more_with_config() only supports 1 socket on this platform ({} requested)",
num
"bind_more_with_config() only supports 1 socket on this platform ({num} requested)"
);
}
Ok(vec![socket])
Expand Down
10 changes: 5 additions & 5 deletions net-utils/src/sockets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ pub fn localhost_port_range_for_tests() -> (u16, u16) {
let slot: u16 = slot.parse().unwrap();
assert!(
offset < SLICE_PER_PROCESS,
"Overrunning into the port range of another test! Consider using fewer ports per test."
"Overrunning into the port range of another test! Consider using fewer ports \
per test."
);
BASE_PORT + slot * SLICE_PER_PROCESS
}
Expand Down Expand Up @@ -217,8 +218,8 @@ pub fn multi_bind_in_range_with_config(
if !PLATFORM_SUPPORTS_SOCKET_CONFIGS && num != 1 {
// See https://github.com/solana-labs/solana/issues/4607
warn!(
"multi_bind_in_range_with_config() only supports 1 socket on this platform ({} requested)",
num
"multi_bind_in_range_with_config() only supports 1 socket on this platform ({num} \
requested)"
);
num = 1;
}
Expand Down Expand Up @@ -320,8 +321,7 @@ pub fn bind_more_with_config(
if !PLATFORM_SUPPORTS_SOCKET_CONFIGS {
if num > 1 {
warn!(
"bind_more_with_config() only supports 1 socket on this platform ({} requested)",
num
"bind_more_with_config() only supports 1 socket on this platform ({num} requested)"
);
}
Ok(vec![socket])
Expand Down
Loading