From 6e7f485a690faab9887961d8305f3ae8d5bd736a Mon Sep 17 00:00:00 2001 From: Fred Clausen <43556888+fredclausen@users.noreply.github.com> Date: Sat, 18 Nov 2023 12:50:42 -0700 Subject: [PATCH] fixing namespace issues --- rust/libraries/acars_connection_manager/Cargo.toml | 2 +- rust/libraries/acars_connection_manager/src/lib.rs | 4 ++-- rust/libraries/acars_connection_manager/src/service_init.rs | 4 ++-- rust/libraries/acars_connection_manager/src/tcp_services.rs | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rust/libraries/acars_connection_manager/Cargo.toml b/rust/libraries/acars_connection_manager/Cargo.toml index 03ebc289..3792de54 100644 --- a/rust/libraries/acars_connection_manager/Cargo.toml +++ b/rust/libraries/acars_connection_manager/Cargo.toml @@ -6,7 +6,7 @@ edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -stubborn-io = { git = "https://github.com/sdr-enthusiasts/sdre-stubborn-io.git" } +sdre-stubborn-io = { git = "https://github.com/sdr-enthusiasts/sdre-stubborn-io.git" } log = "0.4.20" tokio = { version = "1.34.0", features = ["full", "tracing"] } tokio-util = { version = "0.7.10", features = ["full"] } diff --git a/rust/libraries/acars_connection_manager/src/lib.rs b/rust/libraries/acars_connection_manager/src/lib.rs index a5a62c27..841d24d5 100644 --- a/rust/libraries/acars_connection_manager/src/lib.rs +++ b/rust/libraries/acars_connection_manager/src/lib.rs @@ -4,7 +4,7 @@ extern crate acars_config; extern crate acars_vdlm2_parser; extern crate async_trait; extern crate futures; -extern crate stubborn_io; +extern crate sdre_stubborn_io; extern crate tmq; pub extern crate tokio as tokio; extern crate tokio_stream; @@ -19,12 +19,12 @@ pub mod udp_services; pub mod zmq_services; use acars_vdlm2_parser::AcarsVdlm2Message; +use sdre_stubborn_io::ReconnectOptions; use std::collections::HashMap; use std::fmt; use std::fmt::Formatter; use std::net::SocketAddr; use std::time::Duration; -use stubborn_io::ReconnectOptions; use tokio::sync::mpsc; use tokio::sync::mpsc::Receiver; diff --git a/rust/libraries/acars_connection_manager/src/service_init.rs b/rust/libraries/acars_connection_manager/src/service_init.rs index 0456e8a8..9fa9431d 100644 --- a/rust/libraries/acars_connection_manager/src/service_init.rs +++ b/rust/libraries/acars_connection_manager/src/service_init.rs @@ -17,12 +17,12 @@ use crate::{ use acars_config::Input; use acars_vdlm2_parser::AcarsVdlm2Message; use async_trait::async_trait; +use sdre_stubborn_io::tokio::StubbornIo; +use sdre_stubborn_io::StubbornTcpStream; use std::io; use std::net::{AddrParseError, IpAddr, SocketAddr}; use std::str::FromStr; use std::sync::Arc; -use stubborn_io::tokio::StubbornIo; -use stubborn_io::StubbornTcpStream; use tmq::publish::Publish; use tmq::{publish, Context, TmqError}; use tokio::io::BufReader; diff --git a/rust/libraries/acars_connection_manager/src/tcp_services.rs b/rust/libraries/acars_connection_manager/src/tcp_services.rs index 905a72fe..47fdb040 100644 --- a/rust/libraries/acars_connection_manager/src/tcp_services.rs +++ b/rust/libraries/acars_connection_manager/src/tcp_services.rs @@ -7,13 +7,13 @@ use acars_vdlm2_parser::AcarsVdlm2Message; use futures::SinkExt; +use sdre_stubborn_io::tokio::StubbornIo; +use sdre_stubborn_io::StubbornTcpStream; use std::collections::HashMap; use std::error::Error; use std::io; use std::net::SocketAddr; use std::sync::Arc; -use stubborn_io::tokio::StubbornIo; -use stubborn_io::StubbornTcpStream; use tokio::io::AsyncWriteExt; use tokio::net::{TcpListener, TcpStream}; use tokio::sync::mpsc::Receiver;