From c20094fb3ff289441e0c2f606dae12b786942e96 Mon Sep 17 00:00:00 2001 From: "J.A. de Jong - Redu-Sone B.V., ASCEE V.O.F" Date: Thu, 18 Apr 2024 18:49:35 +0200 Subject: [PATCH] Some clippy improvements --- src/bin/lasp_devinfo.rs | 8 ++++---- src/bin/lasp_outputdefault.rs | 4 ++-- src/daq/streamcmd.rs | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bin/lasp_devinfo.rs b/src/bin/lasp_devinfo.rs index cac67d9..21148fb 100644 --- a/src/bin/lasp_devinfo.rs +++ b/src/bin/lasp_devinfo.rs @@ -14,7 +14,7 @@ struct Args { fn main() -> Result<()> { let args = Args::parse(); - let write_all = args.matches.len() == 0; + let write_all = args.matches.is_empty(); let mut smgr = StreamMgr::new(); // Obtain list of devices @@ -27,15 +27,15 @@ fn main() -> Result<()> { // If no device name strings are given, we are outputting them all to a file. if write_all { - let daqconfig = DaqConfig::newFromDeviceInfo(&dev); + let daqconfig = DaqConfig::newFromDeviceInfo(dev); daqconfig.serialize_TOML_file(&filename.clone().into())?; } else { // See if we find the name in the match list. for m in args.matches.iter() { let needle = m.to_lowercase(); - let dev_lower = (&dev.device_name).to_lowercase(); + let dev_lower = dev.device_name.to_lowercase(); if dev_lower.contains(&needle) { - DaqConfig::newFromDeviceInfo(&dev) + DaqConfig::newFromDeviceInfo(dev) .serialize_TOML_file(&filename.clone().into())?; } } diff --git a/src/bin/lasp_outputdefault.rs b/src/bin/lasp_outputdefault.rs index 7745358..f101e83 100644 --- a/src/bin/lasp_outputdefault.rs +++ b/src/bin/lasp_outputdefault.rs @@ -1,6 +1,6 @@ use anyhow::Result; use crossbeam::channel::{unbounded, Receiver, TryRecvError}; -use lasprs::daq::{InStreamMsg, StreamHandler, StreamMgr, StreamStatus, StreamType}; +use lasprs::daq::{StreamMgr, StreamStatus, StreamType}; use lasprs::siggen::Siggen; use std::io; use std::{thread, time}; @@ -11,7 +11,7 @@ fn spawn_stdin_channel() -> Receiver { thread::spawn(move || 'tt: loop { let mut buffer = String::new(); io::stdin().read_line(&mut buffer).unwrap(); - if let Err(_) = tx.send(buffer) { + if tx.send(buffer).is_err() { break 'tt; } }); diff --git a/src/daq/streamcmd.rs b/src/daq/streamcmd.rs index 6f7fe04..b36bedb 100644 --- a/src/daq/streamcmd.rs +++ b/src/daq/streamcmd.rs @@ -1,7 +1,7 @@ //! Provides stream messages that come from a running stream use crate::config::*; use crate::daq::Qty; -use crate::siggen::Siggen; +use crate::siggen::{Siggen, Source}; use anyhow::{bail, Result}; use crossbeam::channel::Sender; use std::any::TypeId;