summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author魏曹先生 <1992414357@qq.com>2025-10-29 16:23:02 +0800
committer魏曹先生 <1992414357@qq.com>2025-10-29 16:23:02 +0800
commit0c0499abfb94d57d9b81c63b3df6e7e5e42a570d (patch)
tree80d9991735ef9fc224107cbb83290c1b9af1820d
parentfdffd0d081465fa4d08645f7e1b546e1addb2ef9 (diff)
Apply clippy suggestion
-rw-r--r--src/bin/jvv.rs17
-rw-r--r--src/utils/socket_addr_helper.rs10
2 files changed, 11 insertions, 16 deletions
diff --git a/src/bin/jvv.rs b/src/bin/jvv.rs
index 57e9dbf..6bcf5c0 100644
--- a/src/bin/jvv.rs
+++ b/src/bin/jvv.rs
@@ -311,12 +311,11 @@ async fn jvv_here(_args: HereArgs) {
if let Ok(mut entries) = fs::read_dir(&virtual_file_root).await {
while let Ok(Some(entry)) = entries.next_entry().await {
- if let Ok(metadata) = entry.metadata().await {
- if metadata.is_file() {
+ if let Ok(metadata) = entry.metadata().await
+ && metadata.is_file() {
num_vf += 1;
total_size += metadata.len();
}
- }
}
}
@@ -394,12 +393,11 @@ async fn jvv_init(_args: InitVaultArgs) {
return;
}
};
- if let Ok(mut entries) = current_dir.read_dir() {
- if entries.next().is_some() {
+ if let Ok(mut entries) = current_dir.read_dir()
+ && entries.next().is_some() {
eprintln!("{}", t!("jvv.fail.init.not_empty"));
return;
}
- }
// Setup vault
let vault_name = match current_dir.file_name() {
@@ -460,12 +458,11 @@ async fn jvv_create(args: CreateVaultArgs) {
return;
}
- if let Ok(mut entries) = target_dir.read_dir() {
- if entries.next().is_some() {
+ if let Ok(mut entries) = target_dir.read_dir()
+ && entries.next().is_some() {
eprintln!("{}", t!("jvv.fail.create.not_empty"));
return;
}
- }
// Setup vault
let vault_name = pascal_case!(args.vault_name);
@@ -617,7 +614,7 @@ async fn jvv_service_listen(args: ListenArgs) {
)
}
- let port = if let Some(port) = args.port { port } else { 0 };
+ let port = args.port.unwrap_or_default();
match server_entry(current_vault, port).await {
Ok(_) => {
info!("{}", t!("jvv.success.service.listen_done").trim());
diff --git a/src/utils/socket_addr_helper.rs b/src/utils/socket_addr_helper.rs
index c6805da..fd7b346 100644
--- a/src/utils/socket_addr_helper.rs
+++ b/src/utils/socket_addr_helper.rs
@@ -17,7 +17,7 @@ pub async fn get_socket_addr(
)
})?;
- return resolve_to_socket_addr(&host, port).await;
+ return resolve_to_socket_addr(host, port).await;
}
// No port specified, use default port
@@ -26,15 +26,13 @@ pub async fn get_socket_addr(
/// Parse host and port from address string
fn parse_host_and_port(address: &str) -> Option<(&str, &str)> {
- if address.starts_with('[') {
- if let Some(close_bracket) = address.find(']') {
- if close_bracket + 1 < address.len() && address.as_bytes()[close_bracket + 1] == b':' {
+ if address.starts_with('[')
+ && let Some(close_bracket) = address.find(']')
+ && close_bracket + 1 < address.len() && address.as_bytes()[close_bracket + 1] == b':' {
let host = &address[1..close_bracket];
let port = &address[close_bracket + 2..];
return Some((host, port));
}
- }
- }
// Handle IPv4 addresses and hostnames with ports
if let Some(colon_pos) = address.rfind(':') {