update to current futuresdr

Author: bastibl

crates/sigmf-utilities/Cargo.toml

@@ -12,17 +12,16 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+anyhow = "1.0"
+clap = { version = "4.4.7", features = ["derive"] }
+fsdr-blocks = {path="../../"}
+futuresdr = { git = "https://github.com/FutureSDR/FutureSDR", branch = "main" }
 serde = "^1.0"
 serde_derive = "^1.0"
 serde_json = "^1.0"
-thiserror = "1.0.50"
-clap = { version = "4.4.7", features = ["derive"] }
-anyhow = { version = "1.0.75"}
 sigmf = {path="../sigmf"}
+thiserror = "1.0.50"
 walkdir = "2.4.0"
-fsdr-blocks = {path="../../"}
-futuresdr = { git = "https://github.com/FutureSDR/FutureSDR", branch = "main" }
-#futuresdr = {path="../../../FutureSDR"}
 
 [build-dependencies]
 rustc_version = "0.4.0"

crates/sigmf-utilities/src/sigmf_convert.rs

@@ -1,3 +1,4 @@
+use anyhow::anyhow;
 use clap::{arg, Parser};
 use fsdr_blocks::sigmf::DatasetFormat;
 use fsdr_blocks::sigmf::DatasetFormat::*;
@@ -7,8 +8,8 @@ use fsdr_blocks::{
 };
 use futuresdr::blocks::TagDebug;
 use futuresdr::macros::connect;
+use futuresdr::runtime::Result;
 use futuresdr::{
-    anyhow::{anyhow, Result},
     blocks::Apply,
     runtime::{Flowgraph, Runtime},
 };

examples/agc/audio_agc.rs

@@ -1,4 +1,4 @@
-use futuresdr::anyhow::Result;
+use futuresdr::runtime::Result;
 use futuresdr::async_io;
 use futuresdr::blocks::audio::AudioSink;
 use futuresdr::blocks::{AgcBuilder, Combine, SignalSourceBuilder};

src/agc.rs

@@ -1,4 +1,3 @@
-use futuresdr::anyhow::Result;
 use futuresdr::macros::message_handler;
 use futuresdr::num_complex::ComplexFloat;
 use futuresdr::runtime::Block;
@@ -8,6 +7,7 @@ use futuresdr::runtime::Kernel;
 use futuresdr::runtime::MessageIo;
 use futuresdr::runtime::MessageIoBuilder;
 use futuresdr::runtime::Pmt;
+use futuresdr::runtime::Result;
 use futuresdr::runtime::StreamIo;
 use futuresdr::runtime::StreamIoBuilder;
 use futuresdr::runtime::WorkIo;

src/async_channel/async_channel_sink.rs

@@ -1,13 +1,12 @@
 use async_channel::Sender;
 
-use futuresdr::anyhow::Result;
-// use futuresdr::log::info;
 use futuresdr::runtime::Block;
 use futuresdr::runtime::BlockMeta;
 use futuresdr::runtime::BlockMetaBuilder;
 use futuresdr::runtime::Kernel;
 use futuresdr::runtime::MessageIo;
 use futuresdr::runtime::MessageIoBuilder;
+use futuresdr::runtime::Result;
 use futuresdr::runtime::StreamIo;
 use futuresdr::runtime::StreamIoBuilder;
 use futuresdr::runtime::WorkIo;

src/async_channel/async_channel_source.rs

@@ -1,14 +1,13 @@
 use async_channel::Receiver;
 use futuresdr::futures::StreamExt;
 
-use futuresdr::anyhow::Result;
-// use futuresdr::log::info;
 use futuresdr::runtime::Block;
 use futuresdr::runtime::BlockMeta;
 use futuresdr::runtime::BlockMetaBuilder;
 use futuresdr::runtime::Kernel;
 use futuresdr::runtime::MessageIo;
 use futuresdr::runtime::MessageIoBuilder;
+use futuresdr::runtime::Result;
 use futuresdr::runtime::StreamIo;
 use futuresdr::runtime::StreamIoBuilder;
 use futuresdr::runtime::WorkIo;

src/channel/crossbeam_sink.rs

@@ -1,12 +1,11 @@
 use async_trait::async_trait;
 use crossbeam_channel::Sender;
-use futuresdr::anyhow::Result;
-// use futuresdr::log::info;
 use futuresdr::runtime::BlockMeta;
 use futuresdr::runtime::BlockMetaBuilder;
 use futuresdr::runtime::Kernel;
 use futuresdr::runtime::MessageIo;
 use futuresdr::runtime::MessageIoBuilder;
+use futuresdr::runtime::Result;
 use futuresdr::runtime::StreamIo;
 use futuresdr::runtime::StreamIoBuilder;
 use futuresdr::runtime::WorkIo;

src/channel/crossbeam_source.rs

@@ -1,12 +1,11 @@
 use async_trait::async_trait;
 use crossbeam_channel::{Receiver, TryRecvError};
-use futuresdr::anyhow::Result;
-// use futuresdr::log::debug;
 use futuresdr::runtime::BlockMeta;
 use futuresdr::runtime::BlockMetaBuilder;
 use futuresdr::runtime::Kernel;
 use futuresdr::runtime::MessageIo;
 use futuresdr::runtime::MessageIoBuilder;
+use futuresdr::runtime::Result;
 use futuresdr::runtime::StreamIo;
 use futuresdr::runtime::StreamIoBuilder;
 use futuresdr::runtime::WorkIo;

src/cw/baseband_to_cw.rs

@@ -1,12 +1,12 @@
 use async_trait::async_trait;
 use std::ops::RangeInclusive;
 
-use futuresdr::anyhow::Result;
 use futuresdr::runtime::BlockMeta;
 use futuresdr::runtime::BlockMetaBuilder;
 use futuresdr::runtime::Kernel;
 use futuresdr::runtime::MessageIo;
 use futuresdr::runtime::MessageIoBuilder;
+use futuresdr::runtime::Result;
 use futuresdr::runtime::StreamIo;
 use futuresdr::runtime::StreamIoBuilder;
 use futuresdr::runtime::WorkIo;

src/cw/cw_to_char.rs

@@ -1,11 +1,11 @@
 use async_trait::async_trait;
 
-use futuresdr::anyhow::Result;
 use futuresdr::runtime::BlockMeta;
 use futuresdr::runtime::BlockMetaBuilder;
 use futuresdr::runtime::Kernel;
 use futuresdr::runtime::MessageIo;
 use futuresdr::runtime::MessageIoBuilder;
+use futuresdr::runtime::Result;
 use futuresdr::runtime::StreamIo;
 use futuresdr::runtime::StreamIoBuilder;
 use futuresdr::runtime::WorkIo;