From 894739bbaba7bba74584ce5c4393ab75c0f4d88e Mon Sep 17 00:00:00 2001 From: Stan Grams Date: Wed, 11 Mar 2026 21:01:38 +0100 Subject: [PATCH] [chore](trx-rs): resolve all compiler and clippy warnings - trx-server/rig_handle: remove dead vchan_manager field (was set but never read after the virtual-channel refactor) - trx-server/listener: remove now-missing vchan_manager initializer - trx-server/main: remove vchan_manager_for_handle intermediates that only fed the dropped field - trx-server/audio: suppress too_many_arguments on run_audio_listener - trx-frontend-http/server: suppress too_many_arguments on build_server - trx-core/vchan: update module doc comment to not reference the removed RigHandle::vchan_manager field Co-Authored-By: Claude Sonnet 4.6 Signed-off-by: Stan Grams --- src/trx-client/trx-frontend/trx-frontend-http/src/server.rs | 1 + src/trx-core/src/vchan.rs | 2 +- src/trx-server/src/audio.rs | 1 + src/trx-server/src/listener.rs | 1 - src/trx-server/src/main.rs | 6 ------ src/trx-server/src/rig_handle.rs | 3 --- 6 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/trx-client/trx-frontend/trx-frontend-http/src/server.rs b/src/trx-client/trx-frontend/trx-frontend-http/src/server.rs index fff8620..b1e88de 100644 --- a/src/trx-client/trx-frontend/trx-frontend-http/src/server.rs +++ b/src/trx-client/trx-frontend/trx-frontend-http/src/server.rs @@ -122,6 +122,7 @@ async fn serve( Ok(()) } +#[allow(clippy::too_many_arguments)] fn build_server( addr: SocketAddr, state_rx: watch::Receiver, diff --git a/src/trx-core/src/vchan.rs b/src/trx-core/src/vchan.rs index 536f056..203a810 100644 --- a/src/trx-core/src/vchan.rs +++ b/src/trx-core/src/vchan.rs @@ -7,7 +7,7 @@ //! A *virtual channel* is an independent DSP slice within the capture bandwidth //! of an SDR rig. Each has its own frequency offset, demodulation mode, and //! PCM audio broadcast. Traditional (non-SDR) rigs do not support virtual -//! channels; their `RigHandle::vchan_manager` field will be `None`. +//! channels; virtual channel operations are not available for traditional rigs. use std::sync::Arc; diff --git a/src/trx-server/src/audio.rs b/src/trx-server/src/audio.rs index 345e8bd..ab56bff 100644 --- a/src/trx-server/src/audio.rs +++ b/src/trx-server/src/audio.rs @@ -1774,6 +1774,7 @@ enum VChanCmd { } /// Run the audio TCP listener, accepting client connections. +#[allow(clippy::too_many_arguments)] pub async fn run_audio_listener( addr: SocketAddr, rx_audio: broadcast::Sender, diff --git a/src/trx-server/src/listener.rs b/src/trx-server/src/listener.rs index c47c978..72279ee 100644 --- a/src/trx-server/src/listener.rs +++ b/src/trx-server/src/listener.rs @@ -466,7 +466,6 @@ mod tests { rig_tx, state_rx, audio_port: 4531, - vchan_manager: None, }; let mut map = HashMap::new(); map.insert("default".to_string(), handle); diff --git a/src/trx-server/src/main.rs b/src/trx-server/src/main.rs index 997c46a..c14f88b 100644 --- a/src/trx-server/src/main.rs +++ b/src/trx-server/src/main.rs @@ -1021,11 +1021,6 @@ async fn main() -> DynResult<()> { ); task_handles.extend(audio_handles); - #[cfg(feature = "soapysdr")] - let vchan_manager_for_handle = sdr_vchan_manager; - #[cfg(not(feature = "soapysdr"))] - let vchan_manager_for_handle: Option = None; - rig_handles.insert( rig_cfg.id.clone(), RigHandle { @@ -1034,7 +1029,6 @@ async fn main() -> DynResult<()> { rig_tx, state_rx, audio_port: rig_cfg.audio.port, - vchan_manager: vchan_manager_for_handle, }, ); } diff --git a/src/trx-server/src/rig_handle.rs b/src/trx-server/src/rig_handle.rs index 0ce5897..acef2db 100644 --- a/src/trx-server/src/rig_handle.rs +++ b/src/trx-server/src/rig_handle.rs @@ -6,7 +6,6 @@ use tokio::sync::{mpsc, watch}; -use trx_core::vchan::SharedVChanManager; use trx_core::rig::request::RigRequest; use trx_core::rig::state::RigState; @@ -25,6 +24,4 @@ pub struct RigHandle { pub state_rx: watch::Receiver, /// Per-rig audio listener TCP port. pub audio_port: u16, - /// Virtual channel manager; `Some` only for SDR rigs. - pub vchan_manager: Option, }