From 527f6b2c724199c7ea323cef0a786e900c1c6470 Mon Sep 17 00:00:00 2001 From: louzt Date: Sat, 27 Jun 2026 22:52:42 -0600 Subject: [PATCH] style: apply cargo fmt to dns, monitoring, optimizer, updater, diagnostics Fix pre-existing formatting drift in 5 files that caused CI fmt failures. Not included (deferred): devtools.rs, tray.rs --- .../src-tauri/src/commands/diagnostics.rs | 30 ++++++++---- .../src-tauri/src/commands/monitoring.rs | 10 ++-- .../tauri/src-tauri/src/commands/optimizer.rs | 42 ++++------------ .../tauri/src-tauri/src/commands/updater.rs | 9 ++-- platforms/tauri/src-tauri/src/services/dns.rs | 48 ++++++++++++------- 5 files changed, 75 insertions(+), 64 deletions(-) diff --git a/platforms/tauri/src-tauri/src/commands/diagnostics.rs b/platforms/tauri/src-tauri/src/commands/diagnostics.rs index 7058777..15013fd 100644 --- a/platforms/tauri/src-tauri/src/commands/diagnostics.rs +++ b/platforms/tauri/src-tauri/src/commands/diagnostics.rs @@ -87,7 +87,10 @@ fn linux_primary_adapter() -> Option { } } - let devices = linux_capture("nmcli", &["-t", "-f", "DEVICE,TYPE,STATE", "device", "status"])?; + let devices = linux_capture( + "nmcli", + &["-t", "-f", "DEVICE,TYPE,STATE", "device", "status"], + )?; for line in devices.lines() { let mut fields = line.split(':'); @@ -204,7 +207,13 @@ fn linux_write_network_snapshot() -> Result { "nmcli device status", linux_capture( "nmcli", - &["-t", "-f", "DEVICE,TYPE,STATE,CONNECTION", "device", "status"], + &[ + "-t", + "-f", + "DEVICE,TYPE,STATE,CONNECTION", + "device", + "status", + ], ), ), ("resolvectl dns", linux_capture("resolvectl", &["dns"])), @@ -644,7 +653,9 @@ async fn resolve_dns_with_server(domain: &str, dns_server: &str) -> bool { .output(); #[cfg(not(windows))] - let output = linux_command("nslookup").args([domain, dns_server]).output(); + let output = linux_command("nslookup") + .args([domain, dns_server]) + .output(); match output { Ok(o) if o.status.success() => { @@ -923,10 +934,7 @@ pub async fn open_system_tool(tool: String) -> Result { linux_spawn("xdg-open", &[snapshot_path.as_str()])?; Ok("Resumen de red abierto en tu visor predeterminado".to_string()) } else { - Ok(format!( - "Resumen de red guardado en {}", - snapshot.display() - )) + Ok(format!("Resumen de red guardado en {}", snapshot.display())) } } _ => Err(format!("Herramienta no permitida: {}", tool)), @@ -1028,7 +1036,13 @@ pub async fn reset_network_stack() -> Result { actions.push(format!("configuración reaplicada sobre {}", adapter)); } else if let Some(connection) = linux_active_connection(&adapter) { if linux_command("nmcli") - .args(["connection", "up", connection.as_str(), "ifname", adapter.as_str()]) + .args([ + "connection", + "up", + connection.as_str(), + "ifname", + adapter.as_str(), + ]) .output() .map(|output| output.status.success()) .unwrap_or(false) diff --git a/platforms/tauri/src-tauri/src/commands/monitoring.rs b/platforms/tauri/src-tauri/src/commands/monitoring.rs index 544b112..6bf5c3e 100644 --- a/platforms/tauri/src-tauri/src/commands/monitoring.rs +++ b/platforms/tauri/src-tauri/src/commands/monitoring.rs @@ -159,10 +159,8 @@ fn get_adapter_metrics( #[cfg(not(windows))] { let read_stat = |name: &str| -> Result> { - let value = fs::read_to_string(format!( - "/sys/class/net/{}/statistics/{}", - adapter, name - ))?; + let value = + fs::read_to_string(format!("/sys/class/net/{}/statistics/{}", adapter, name))?; Ok(value.trim().parse().unwrap_or(0)) }; @@ -217,7 +215,9 @@ fn get_adapter_metrics( fn measure_latency() -> Result> { #[cfg(not(windows))] { - let route_output = Command::new("ip").args(["route", "show", "default"]).output()?; + let route_output = Command::new("ip") + .args(["route", "show", "default"]) + .output()?; let routes = String::from_utf8_lossy(&route_output.stdout); let gateway = routes .lines() diff --git a/platforms/tauri/src-tauri/src/commands/optimizer.rs b/platforms/tauri/src-tauri/src/commands/optimizer.rs index 951cf92..0ad024c 100644 --- a/platforms/tauri/src-tauri/src/commands/optimizer.rs +++ b/platforms/tauri/src-tauri/src/commands/optimizer.rs @@ -127,8 +127,8 @@ fn linux_current_settings() -> TcpSettings { } .to_string(); - let pacing = linux_sysctl_get("net.core.default_qdisc") - .unwrap_or_else(|| "unknown".to_string()); + let pacing = + linux_sysctl_get("net.core.default_qdisc").unwrap_or_else(|| "unknown".to_string()); let rack = match linux_sysctl_get("net.ipv4.tcp_recovery").as_deref() { Some("0") => "disabled", @@ -367,10 +367,8 @@ pub fn get_current_settings_internal() -> Result { let ecn = extract_value_multi(&stdout, &["ECN Capability", "Funcionalidad de ECN"]); // Timestamps - let timestamps = extract_value_multi( - &stdout, - &["RFC 1323 Timestamps", "Marcas de hora RFC 1323"], - ); + let timestamps = + extract_value_multi(&stdout, &["RFC 1323 Timestamps", "Marcas de hora RFC 1323"]); // Chimney (deprecado en Windows 10+) let chimney = extract_value_multi(&stdout, &["Chimney Offload State"]); @@ -494,12 +492,7 @@ pub fn apply_profile_internal(profile: &str) -> Result, String> { "Window scaling enabled", &mut applied, )?; - linux_apply_sysctl( - "net.ipv4.tcp_ecn", - "1", - "ECN enabled", - &mut applied, - )?; + linux_apply_sysctl("net.ipv4.tcp_ecn", "1", "ECN enabled", &mut applied)?; linux_apply_sysctl( "net.ipv4.tcp_timestamps", "1", @@ -535,12 +528,7 @@ pub fn apply_profile_internal(profile: &str) -> Result, String> { "Window scaling enabled", &mut applied, )?; - linux_apply_sysctl( - "net.ipv4.tcp_ecn", - "1", - "ECN enabled", - &mut applied, - )?; + linux_apply_sysctl("net.ipv4.tcp_ecn", "1", "ECN enabled", &mut applied)?; linux_apply_sysctl( "net.ipv4.tcp_timestamps", "1", @@ -686,9 +674,7 @@ pub fn apply_profile_internal(profile: &str) -> Result, String> { // https://docs.microsoft.com/en-us/windows/win32/api/qos2/ // Valor 0xFFFFFFFF = sin throttling if set_registry_dword("NetworkThrottlingIndex", 0xffffffff).is_ok() { - applied.push( - "Network Throttling disabled (10ms delay removed)".to_string(), - ); + applied.push("Network Throttling disabled (10ms delay removed)".to_string()); } // Nagle Algorithm: Desactivar para reducir latencia en gaming/realtime @@ -702,9 +688,7 @@ pub fn apply_profile_internal(profile: &str) -> Result, String> { // Bit 1 (valor 2): Timestamps // Valor 3 = ambos habilitados if set_registry_dword("Tcp1323Opts", 3).is_ok() { - applied.push( - "TCP Window Scaling + Timestamps (Tcp1323Opts=3)".to_string(), - ); + applied.push("TCP Window Scaling + Timestamps (Tcp1323Opts=3)".to_string()); } } _ => { @@ -747,12 +731,7 @@ pub fn reset_to_defaults_internal() -> Result, String> { "Window scaling reset", &mut reset, )?; - linux_apply_sysctl( - "net.ipv4.tcp_ecn", - "2", - "ECN reset", - &mut reset, - )?; + linux_apply_sysctl("net.ipv4.tcp_ecn", "2", "ECN reset", &mut reset)?; linux_apply_sysctl( "net.ipv4.tcp_timestamps", "1", @@ -795,8 +774,7 @@ pub fn reset_to_defaults_internal() -> Result, String> { if reset.is_empty() { return Err( - "No se restauraron valores Linux; faltan permisos o soporte del kernel" - .to_string(), + "No se restauraron valores Linux; faltan permisos o soporte del kernel".to_string(), ); } diff --git a/platforms/tauri/src-tauri/src/commands/updater.rs b/platforms/tauri/src-tauri/src/commands/updater.rs index efdf359..808684c 100644 --- a/platforms/tauri/src-tauri/src/commands/updater.rs +++ b/platforms/tauri/src-tauri/src/commands/updater.rs @@ -131,8 +131,8 @@ pub async fn install_update(path: String) -> Result<(), String> { .to_lowercase(); if filename.ends_with(".appimage") { - let metadata = fs::metadata(&path) - .map_err(|e| format!("No se pudo leer el AppImage: {}", e))?; + let metadata = + fs::metadata(&path).map_err(|e| format!("No se pudo leer el AppImage: {}", e))?; let mut permissions = metadata.permissions(); permissions.set_mode(permissions.mode() | 0o755); fs::set_permissions(&path, permissions) @@ -164,7 +164,10 @@ pub async fn install_update(path: String) -> Result<(), String> { return Ok(()); } - Err("No se encontró un abridor gráfico compatible para instalar la actualización en Linux".to_string()) + Err( + "No se encontró un abridor gráfico compatible para instalar la actualización en Linux" + .to_string(), + ) } } diff --git a/platforms/tauri/src-tauri/src/services/dns.rs b/platforms/tauri/src-tauri/src/services/dns.rs index 526a86d..8a69647 100644 --- a/platforms/tauri/src-tauri/src/services/dns.rs +++ b/platforms/tauri/src-tauri/src/services/dns.rs @@ -33,18 +33,20 @@ fn run_command_capture(program: &str, args: &[&str]) -> Result { #[cfg(not(windows))] fn is_virtual_linux_interface(device: &str, device_type: &str) -> bool { - matches!(device_type, "loopback" | "bridge" | "wireguard" | "wifi-p2p") - || matches!( - device, - name if name == "lo" - || name.starts_with("docker") - || name.starts_with("br-") - || name.starts_with("veth") - || name.starts_with("virbr") - || name.starts_with("wg") - || name.starts_with("tun") - || name.starts_with("tap") - ) + matches!( + device_type, + "loopback" | "bridge" | "wireguard" | "wifi-p2p" + ) || matches!( + device, + name if name == "lo" + || name.starts_with("docker") + || name.starts_with("br-") + || name.starts_with("veth") + || name.starts_with("virbr") + || name.starts_with("wg") + || name.starts_with("tun") + || name.starts_with("tap") + ) } #[cfg(not(windows))] @@ -103,7 +105,10 @@ fn normalize_nm_bool(value: &str) -> bool { #[cfg(not(windows))] fn parse_dns_server_list(raw: &str) -> Vec { let values = raw.replace('\n', " "); - let values = values.split_once(':').map(|(_, rest)| rest).unwrap_or(&values); + let values = values + .split_once(':') + .map(|(_, rest)| rest) + .unwrap_or(&values); values .split(|ch: char| ch == ',' || ch.is_whitespace()) @@ -121,7 +126,10 @@ pub fn get_current_dns_servers(adapter: &str) -> Result, String> { } } - let raw = run_command_capture("nmcli", &["-t", "-g", "IP4.DNS,IP6.DNS", "device", "show", adapter])?; + let raw = run_command_capture( + "nmcli", + &["-t", "-g", "IP4.DNS,IP6.DNS", "device", "show", adapter], + )?; Ok(parse_dns_server_list(&raw)) } @@ -217,7 +225,13 @@ pub fn get_primary_adapter() -> Result { { let raw = run_command_capture( "nmcli", - &["-t", "-f", "DEVICE,TYPE,STATE,CONNECTION", "device", "status"], + &[ + "-t", + "-f", + "DEVICE,TYPE,STATE,CONNECTION", + "device", + "status", + ], )?; for line in raw.lines() { @@ -240,7 +254,9 @@ pub fn get_primary_adapter() -> Result { return Ok(device.to_string()); } - return Err("No se encontró un adaptador Linux activo administrado por NetworkManager".to_string()); + return Err( + "No se encontró un adaptador Linux activo administrado por NetworkManager".to_string(), + ); } #[cfg(windows)]