harald/zeroclaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

fix: gate nusb/hardware discovery to Linux/macOS/Windows only

Browse source 
Android (Termux) reports target_os="android" which is not supported
by nusb::list_devices(). This caused E0425 and E0282 compile errors
when building on Termux.

Changes:
- Cargo.toml: move nusb to a target-gated dependency block so it is
  only compiled on linux/macos/windows
- src/hardware/discover.rs: add #![cfg(...)] file-level gate matching
  the nusb platform support matrix
- src/hardware/mod.rs: gate discover/introspect module declarations,
  discover_hardware() call, handle_command() dispatch, and all helper
  fns on the same platform set; add a clear user-facing message on
  unsupported platforms
- src/security/pairing.rs: replace deprecated rand::thread_rng() with
  rand::rng() to keep clippy -D warnings clean

Fixes #880
This commit is contained in:
argenis de la rosa 2026-02-18 23:44:20 -05:00 • committed by Chummy
parent ba500a606e
commit a03ddc3ace
3 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/hardware/discover.rs
View file

@ -1,4 +1,10 @@
//! USB device discovery — enumerate devices and enrich with board registry.
//!
//! USB enumeration via `nusb` is only supported on Linux, macOS, and Windows.
//! On Android (Termux) and other unsupported platforms this module is excluded
//! from compilation; callers in `hardware/mod.rs` fall back to an empty result.
#![cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))]
use super::registry;
use anyhow::Result;

27
src/hardware/mod.rs
View file

@ -4,10 +4,10 @@
pub mod registry;
#[cfg(feature = "hardware")]
#[cfg(all(feature = "hardware", any(target_os = "linux", target_os = "macos", target_os = "windows")))]
pub mod discover;
#[cfg(feature = "hardware")]
#[cfg(all(feature = "hardware", any(target_os = "linux", target_os = "macos", target_os = "windows")))]
pub mod introspect;
use crate::config::Config;
@ -28,8 +28,9 @@ pub struct DiscoveredDevice {
/// Auto-discover connected hardware devices.
/// Returns an empty vec on platforms without hardware support.
pub fn discover_hardware() -> Vec<DiscoveredDevice> {
// USB/serial discovery is behind the "hardware" feature gate.
#[cfg(feature = "hardware")]
// USB/serial discovery is behind the "hardware" feature gate and only
// available on platforms where nusb supports device enumeration.
#[cfg(all(feature = "hardware", any(target_os = "linux", target_os = "macos", target_os = "windows")))]
{
if let Ok(devices) = discover::list_usb_devices() {
return devices
@ -102,7 +103,15 @@ pub fn handle_command(cmd: crate::HardwareCommands, _config: &Config) -> Result<
return Ok(());
}
#[cfg(feature = "hardware")]
#[cfg(all(feature = "hardware", not(any(target_os = "linux", target_os = "macos", target_os = "windows"))))]
{
let _ = &cmd;
println!("Hardware USB discovery is not supported on this platform.");
println!("Supported platforms: Linux, macOS, Windows.");
return Ok(());
}
#[cfg(all(feature = "hardware", any(target_os = "linux", target_os = "macos", target_os = "windows")))]
match cmd {
crate::HardwareCommands::Discover => run_discover(),
crate::HardwareCommands::Introspect { path } => run_introspect(&path),
@ -110,7 +119,7 @@ pub fn handle_command(cmd: crate::HardwareCommands, _config: &Config) -> Result<
}
}
#[cfg(feature = "hardware")]
#[cfg(all(feature = "hardware", any(target_os = "linux", target_os = "macos", target_os = "windows")))]
fn run_discover() -> Result<()> {
let devices = discover::list_usb_devices()?;
@ -138,7 +147,7 @@ fn run_discover() -> Result<()> {
Ok(())
}
#[cfg(feature = "hardware")]
#[cfg(all(feature = "hardware", any(target_os = "linux", target_os = "macos", target_os = "windows")))]
fn run_introspect(path: &str) -> Result<()> {
let result = introspect::introspect_device(path)?;
@ -160,7 +169,7 @@ fn run_introspect(path: &str) -> Result<()> {
Ok(())
}
#[cfg(feature = "hardware")]
#[cfg(all(feature = "hardware", any(target_os = "linux", target_os = "macos", target_os = "windows")))]
fn run_info(chip: &str) -> Result<()> {
#[cfg(feature = "probe")]
{
@ -192,7 +201,7 @@ fn run_info(chip: &str) -> Result<()> {
}
}
#[cfg(all(feature = "hardware", feature = "probe"))]
#[cfg(all(feature = "hardware", feature = "probe", any(target_os = "linux", target_os = "macos", target_os = "windows")))]
fn info_via_probe(chip: &str) -> anyhow::Result<()> {
use probe_rs::config::MemoryRegion;
use probe_rs::{Session, SessionConfig};