Define proto::core module.

src/proto/core/mod.rs

@@ -0,0 +1,5 @@
+pub mod constants;
+pub mod frame;
+mod prefix;
+mod u32;
+pub mod value;

src/proto/prefix.rs → src/proto/core/prefix.rs

@@ -5,7 +5,7 @@ use std::convert::TryFrom;
 
 use bytes::BytesMut;
 
-use crate::proto::u32::{encode_u32, U32_BYTE_LEN};
+use crate::proto::core::u32::{encode_u32, U32_BYTE_LEN};
 
 /// Helper for writing length-prefixed values into buffers, without having to
 /// know the length ahead of encoding time.
@@ -87,7 +87,7 @@ mod tests {
 
   use bytes::{BufMut, BytesMut};
 
-  use crate::proto::u32::{decode_u32, U32_BYTE_LEN};
+  use crate::proto::core::u32::{decode_u32, U32_BYTE_LEN};
 
   #[test]
   fn finalize_empty() {

src/proto/mod.rs

@@ -1,24 +1,15 @@
-mod constants;
-mod frame;
+mod core;
 mod handler;
 mod packet;
 pub mod peer;
-mod prefix;
 pub mod server;
 mod stream;
 #[cfg(test)]
 mod testing;
-pub mod u32;
 mod user;
-mod value;
 
-pub use self::frame::FrameStream;
 pub use self::handler::*;
 pub use self::packet::*;
 pub use self::server::{ServerRequest, ServerResponse};
 pub use self::stream::*;
 pub use self::user::{User, UserStatus};
-pub use self::value::{
-  Decode, ValueDecode, ValueDecodeError, ValueDecoder, ValueEncode,
-  ValueEncodeError, ValueEncoder,
-};

src/proto/packet.rs

@@ -11,7 +11,7 @@ use encoding::{DecoderTrap, EncoderTrap, Encoding};
 #[allow(deprecated)]
 use mio::deprecated::TryRead;
 
-use super::constants::*;
+use crate::proto::core::constants::*;
 
 /*==================*
  * READ-ONLY PACKET *

src/proto/peer/message.rs

@@ -1,10 +1,12 @@
 use std::io;
 
+use crate::proto::core::value::{
+  ValueDecode, ValueDecodeError, ValueDecoder, ValueEncode, ValueEncodeError,
+  ValueEncoder,
+};
 use crate::proto::peer::constants::*;
 use crate::proto::{
-  MutPacket, Packet, PacketReadError, ReadFromPacket, ValueDecode,
-  ValueDecodeError, ValueDecoder, ValueEncode, ValueEncodeError, ValueEncoder,
-  WriteToPacket,
+  MutPacket, Packet, PacketReadError, ReadFromPacket, WriteToPacket,
 };
 
 /*=========*
@@ -158,8 +160,8 @@ impl ValueDecode for PeerInit {
 mod tests {
   use bytes::BytesMut;
 
-  use crate::proto::value::tests::roundtrip;
-  use crate::proto::{ValueDecodeError, ValueDecoder};
+  use crate::proto::core::value::tests::roundtrip;
+  use crate::proto::core::value::{ValueDecodeError, ValueDecoder};
 
   use super::*;
 

src/proto/server/request.rs

@@ -3,12 +3,12 @@ use std::io;
 use crypto::digest::Digest;
 use crypto::md5::Md5;
 
-use crate::proto::packet::{MutPacket, WriteToPacket};
-use crate::proto::server::constants::*;
-use crate::proto::{
+use crate::proto::core::value::{
   ValueDecode, ValueDecodeError, ValueDecoder, ValueEncode, ValueEncodeError,
   ValueEncoder,
 };
+use crate::proto::packet::{MutPacket, WriteToPacket};
+use crate::proto::server::constants::*;
 
 /* ------- *
  * Helpers *
@@ -589,8 +589,8 @@ impl ValueDecode for UserStatusRequest {
 mod tests {
   use bytes::BytesMut;
 
-  use crate::proto::value::tests::roundtrip;
-  use crate::proto::{ValueDecodeError, ValueDecoder};
+  use crate::proto::core::value::tests::roundtrip;
+  use crate::proto::core::value::{ValueDecodeError, ValueDecoder};
 
   use super::*;
 

src/proto/server/response.rs

@@ -1,11 +1,12 @@
 use std::net;
 
+use crate::proto::core::value::{
+  ValueDecode, ValueDecodeError, ValueDecoder, ValueEncode, ValueEncodeError,
+  ValueEncoder,
+};
 use crate::proto::packet::{Packet, PacketReadError, ReadFromPacket};
 use crate::proto::server::constants::*;
-use crate::proto::{
-  User, UserStatus, ValueDecode, ValueDecodeError, ValueDecoder, ValueEncode,
-  ValueEncodeError, ValueEncoder,
-};
+use crate::proto::{User, UserStatus};
 
 /*=================*
  * SERVER RESPONSE *
@@ -1374,8 +1375,8 @@ mod tests {
 
   use bytes::BytesMut;
 
-  use crate::proto::value::tests::roundtrip;
-  use crate::proto::{ValueDecodeError, ValueDecoder};
+  use crate::proto::core::value::tests::roundtrip;
+  use crate::proto::core::value::{ValueDecodeError, ValueDecoder};
 
   use super::*;
 

src/proto/testing.rs

@@ -5,7 +5,8 @@ use std::net::SocketAddr;
 
 use tokio::net::{TcpListener, TcpStream};
 
-use crate::proto::{FrameStream, ServerRequest, ServerResponse};
+use crate::proto::core::frame::FrameStream;
+use crate::proto::{ServerRequest, ServerResponse};
 
 async fn process(stream: TcpStream) -> io::Result<()> {
   let mut connection =

src/proto/user.rs

@@ -1,9 +1,11 @@
 use std::io;
 
+use crate::proto::core::value::{
+  ValueDecode, ValueDecodeError, ValueDecoder, ValueEncode, ValueEncodeError,
+  ValueEncoder,
+};
 use crate::proto::{
-  MutPacket, Packet, PacketReadError, ReadFromPacket, ValueDecode,
-  ValueDecodeError, ValueDecoder, ValueEncode, ValueEncodeError, ValueEncoder,
-  WriteToPacket,
+  MutPacket, Packet, PacketReadError, ReadFromPacket, WriteToPacket,
 };
 
 const STATUS_OFFLINE: u32 = 1;