Moved protocol-related stuff to new proto module.

src/client/data/mod.rs

@@ -1,10 +1,10 @@
 //! Data related to IRC functionality.
 
-pub use client::data::caps::{Capability, NegotiationVersion};
+pub use proto::caps::{Capability, NegotiationVersion};
-pub use client::data::command::Command;
+pub use proto::command::Command;
 pub use client::data::config::Config;
-pub use client::data::message::Message;
+pub use proto::message::Message;
-pub use client::data::response::Response;
+pub use proto::response::Response;
 pub use client::data::user::{AccessLevel, User};
 
 pub mod kinds {
@@ -20,9 +20,5 @@ pub mod kinds {
     impl<T> IrcRead for T where T: BufRead + Sized + Send + 'static {}
 }
 
-pub mod caps;
-pub mod command;
 pub mod config;
-pub mod message;
-pub mod response;
 pub mod user;

src/client/server/utils.rs

@@ -4,7 +4,7 @@ use std::borrow::ToOwned;
 use client::data::{Capability, NegotiationVersion};
 use client::data::Command::{AUTHENTICATE, CAP, INVITE, JOIN, KICK, KILL, MODE, NICK, NOTICE};
 use client::data::Command::{OPER, PART, PASS, PONG, PRIVMSG, QUIT, SAMODE, SANICK, TOPIC, USER};
-use client::data::command::CapSubCommand::{END, LS, REQ};
+use proto::command::CapSubCommand::{END, LS, REQ};
 #[cfg(feature = "ctcp")] use time::get_time;
 use client::server::Server;
 

src/lib.rs

@@ -7,4 +7,5 @@ extern crate encoding;
 extern crate rustc_serialize;
 
 pub mod client;
+pub mod proto;
 pub mod server;

src/proto/mod.rs

@@ -0,0 +1,6 @@
+//! Support for the IRC protocol using Tokio.
+
+pub mod caps;
+pub mod command;
+pub mod message;
+pub mod response;