Skip to content

Commit

Permalink
fixing namespace issues
Browse files Browse the repository at this point in the history
  • Loading branch information
fredclausen committed Nov 18, 2023
1 parent d5cf682 commit 6e7f485
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion rust/libraries/acars_connection_manager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
4 changes: 2 additions & 2 deletions rust/libraries/acars_connection_manager/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions rust/libraries/acars_connection_manager/src/service_init.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions rust/libraries/acars_connection_manager/src/tcp_services.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 6e7f485

Please sign in to comment.