diff --git a/cove-core/src/lib.rs b/cove-core/src/lib.rs index 8738109..08ad754 100644 --- a/cove-core/src/lib.rs +++ b/cove-core/src/lib.rs @@ -5,6 +5,7 @@ mod id; mod macros; mod message; pub mod packets; +pub mod replies; mod session; pub use self::id::*; diff --git a/cove-tui/src/replies.rs b/cove-core/src/replies.rs similarity index 98% rename from cove-tui/src/replies.rs rename to cove-core/src/replies.rs index de6f054..31a15f9 100644 --- a/cove-tui/src/replies.rs +++ b/cove-core/src/replies.rs @@ -1,5 +1,3 @@ -// TODO Move this into core - use std::collections::HashMap; use std::hash::Hash; use std::result; diff --git a/cove-tui/src/cove/conn.rs b/cove-tui/src/cove/conn.rs index 21623d8..27f67c4 100644 --- a/cove-tui/src/cove/conn.rs +++ b/cove-tui/src/cove/conn.rs @@ -7,12 +7,11 @@ use cove_core::packets::{ Cmd, IdentifyCmd, IdentifyRpl, JoinNtf, NickNtf, NickRpl, Ntf, Packet, PartNtf, RoomCmd, RoomRpl, Rpl, SendNtf, SendRpl, WhoRpl, }; -use cove_core::{Session, SessionId}; +use cove_core::replies::Replies; +use cove_core::{replies, Session, SessionId}; use tokio::sync::mpsc::UnboundedSender; use tokio::sync::Mutex; -use crate::replies::{self, Replies}; - // TODO Split into "interacting" and "maintenance" parts? #[derive(Debug, thiserror::Error)] pub enum Error { diff --git a/cove-tui/src/main.rs b/cove-tui/src/main.rs index a082ed2..acc2f33 100644 --- a/cove-tui/src/main.rs +++ b/cove-tui/src/main.rs @@ -3,7 +3,6 @@ mod config; mod cove; mod never; -mod replies; mod ui; use std::io;