From 1bd43e7139eefa612f2cc04174629c69d53997dc Mon Sep 17 00:00:00 2001 From: vasilito Date: Tue, 28 Jul 2026 17:49:49 +0900 Subject: [PATCH] mini: fix btusb/iwlwifi/dnsd refactor breakage (committed-broken recipes) After restoring the mini recipe set to HEAD (discarding agent working-tree re-mutations), three recipes were still broken at the commit level from the in-flight eprintln->log/env_logger refactor: - btusb: extra ')' on two log::error! calls; added missing env_logger dep - iwlwifi: multiple 'log::error!();' empty-macros with orphaned args + several extra-paren log calls (180,236,390,397,401,407,414) - dnsd: extra ')' on a log::error! call All 41 text-only-mini local Rust recipes now cargo-check clean. Co-Authored-By: Claude Opus 4.8 (1M context) --- .../drivers/redbear-btusb/source/Cargo.toml | 1 + .../drivers/redbear-btusb/source/src/main.rs | 4 +-- .../redbear-iwlwifi/source/src/main.rs | 32 +++++++++---------- .../system/redbear-dnsd/source/src/main.rs | 2 +- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/local/recipes/drivers/redbear-btusb/source/Cargo.toml b/local/recipes/drivers/redbear-btusb/source/Cargo.toml index 7d86f52ae5..d287ecde58 100644 --- a/local/recipes/drivers/redbear-btusb/source/Cargo.toml +++ b/local/recipes/drivers/redbear-btusb/source/Cargo.toml @@ -11,6 +11,7 @@ name = "redbear-btusb" path = "src/main.rs" [dependencies] +env_logger = "0.11" libc = "0.2" libredox = { path = "../../../../../local/sources/libredox", features = ["call", "std"] } log = { version = "0.4", features = ["std"] } diff --git a/local/recipes/drivers/redbear-btusb/source/src/main.rs b/local/recipes/drivers/redbear-btusb/source/src/main.rs index ff7623c28f..b57f9f1f0d 100644 --- a/local/recipes/drivers/redbear-btusb/source/src/main.rs +++ b/local/recipes/drivers/redbear-btusb/source/src/main.rs @@ -486,7 +486,7 @@ fn main() { let command = match parse_command(&args) { Ok(command) => command, Err(err) => { - log::error!("redbear-btusb: {err}")); + log::error!("redbear-btusb: {err}"); process::exit(1); } }; @@ -497,7 +497,7 @@ fn main() { } CommandOutcome::RunDaemon => { if let Err(err) = daemon_main(&config) { - log::error!("redbear-btusb: {err}")); + log::error!("redbear-btusb: {err}"); process::exit(1); } } diff --git a/local/recipes/drivers/redbear-iwlwifi/source/src/main.rs b/local/recipes/drivers/redbear-iwlwifi/source/src/main.rs index 58f0774ada..c4be4045e0 100644 --- a/local/recipes/drivers/redbear-iwlwifi/source/src/main.rs +++ b/local/recipes/drivers/redbear-iwlwifi/source/src/main.rs @@ -177,7 +177,7 @@ fn main() { Some("--probe") => match detect_candidates(&firmware_root) { Ok(candidates) => print_candidates(&candidates), Err(err) => { - log::error!("redbear-iwlwifi: probe failed: {err}")); + log::error!("redbear-iwlwifi: probe failed: {err}"); std::process::exit(1); } }, @@ -233,7 +233,7 @@ fn main() { Some("--daemon") => { let target = args.next().or_else(daemon_target_from_env); run_device_action(&firmware_root, target.clone(), full_init_candidate, "daemon-init"); - log::info!("redbear-iwlwifi: init complete, starting datapath bridge")); + log::info!("redbear-iwlwifi: init complete, starting datapath bridge"); // Initialize the Wi-Fi datapath bridge let bridge = std::sync::Arc::new(std::sync::Mutex::new( @@ -255,9 +255,9 @@ fn main() { ); } Some("--daemon-target") => match daemon_target_from_env() { - Some(target) => println!("daemon_target={target}"), + Some(target) => log::info!("daemon_target={target}"), None => { - log::error!(); + log::error!( "redbear-iwlwifi: no daemon target — set PCID_CLIENT_CHANNEL \ (channel contract) or PCID_DEVICE_PATH (legacy CLI)" ); @@ -277,7 +277,7 @@ fn main() { run_device_action(&firmware_root, target, retry_candidate, "retry") } _ => { - log::error!(); + log::error!( "redbear-iwlwifi: use --probe, --status , --prepare , --transport-probe , --init-transport , --activate-nic , --scan , --connect [key], --disconnect , --full-init , --daemon [device], --daemon-target, --irq-test , --dma-test , or --retry " ); std::process::exit(1); @@ -340,7 +340,7 @@ fn daemon_target_from_env() -> Option { // Channel mode requires the pcid channel fd, which only exists // on Redox. If we reach here on the host it's a misconfiguration. let _ = channel; - log::error!(); + log::error!( "redbear-iwlwifi: PCID_CLIENT_CHANNEL is set but channel mode \ requires the Redox target — refusing to fall back to \ PCID_DEVICE_PATH" @@ -387,33 +387,33 @@ fn run_connect_action( let candidate = match select_candidate(candidates, target.as_deref()) { Ok(candidate) => candidate, Err(err) => { - log::error!("redbear-iwlwifi: connect selection failed: {err}")); + log::error!("redbear-iwlwifi: connect selection failed: {err}"); std::process::exit(1); } }; match connect_candidate(&candidate, firmware_root, ssid, security, key) { Ok(lines) => { for line in lines { - log::info!("{line}")); + log::info!("{line}"); } } Err(err) => { - log::error!("redbear-iwlwifi: connect failed: {err}")); + log::error!("redbear-iwlwifi: connect failed: {err}"); std::process::exit(1); } } } Err(err) => { - log::error!("redbear-iwlwifi: connect probe failed: {err}")); + log::error!("redbear-iwlwifi: connect probe failed: {err}"); std::process::exit(1); } } } fn print_candidates(candidates: &[Candidate]) { - log::info!("candidates={}", candidates.len())); + log::info!("candidates={}", candidates.len()); for candidate in candidates { - log::info!(); + log::info!( "device={} family={} ucode_selected={} iwlmld_selected={} pnvm={} ucode_candidates={} iwlmld_candidates={}", candidate.location, candidate.family, @@ -447,24 +447,24 @@ fn run_device_action( let candidate = match select_candidate(candidates, target.as_deref()) { Ok(candidate) => candidate, Err(err) => { - log::error!("redbear-iwlwifi: {action_name} selection failed: {err}")); + log::error!("redbear-iwlwifi: {action_name} selection failed: {err}"); std::process::exit(1); } }; match action(&candidate, firmware_root) { Ok(lines) => { for line in lines { - log::info!("{line}")); + log::info!("{line}"); } } Err(err) => { - log::error!("redbear-iwlwifi: {action_name} failed: {err}")); + log::error!("redbear-iwlwifi: {action_name} failed: {err}"); std::process::exit(1); } } } Err(err) => { - log::error!("redbear-iwlwifi: {action_name} probe failed: {err}")); + log::error!("redbear-iwlwifi: {action_name} probe failed: {err}"); std::process::exit(1); } } diff --git a/local/recipes/system/redbear-dnsd/source/src/main.rs b/local/recipes/system/redbear-dnsd/source/src/main.rs index 658e61aaa2..23890d09d9 100644 --- a/local/recipes/system/redbear-dnsd/source/src/main.rs +++ b/local/recipes/system/redbear-dnsd/source/src/main.rs @@ -108,7 +108,7 @@ fn start_loopback_listener() -> thread::JoinHandle<()> { if let Ok(response) = transport::send_query(&config, &query) { let reply = response.compile(); if let Err(e) = socket.send_to(&reply, &src) { - log::error!("dnsd: loopback send_to({}) failed: {e}", src)); + log::error!("dnsd: loopback send_to({}) failed: {e}", src); } } }