Re-export all the things.

src/mariadb/mod.rs

@@ -1,2 +1,44 @@
 pub mod connection;
 pub mod protocol;
+
+// Re-export all the things
+pub use connection::ConnContext;
+pub use connection::Connection;
+pub use protocol::AuthenticationSwitchRequestPacket;
+pub use protocol::ColumnPacket;
+pub use protocol::ColumnDefPacket;
+pub use protocol::ComDebug;
+pub use protocol::ComInitDb;
+pub use protocol::ComPing;
+pub use protocol::ComProcessKill;
+pub use protocol::ComQuery;
+pub use protocol::ComQuit;
+pub use protocol::ComResetConnection;
+pub use protocol::ComSetOption;
+pub use protocol::SetOptionOptions;
+pub use protocol::ShutdownOptions;
+pub use protocol::ComShutdown;
+pub use protocol::ComSleep;
+pub use protocol::ComStatistics;
+pub use protocol::EofPacket;
+pub use protocol::ErrPacket;
+pub use protocol::HandshakeResponsePacket;
+pub use protocol::InitialHandshakePacket;
+pub use protocol::OkPacket;
+pub use protocol::PacketHeader;
+pub use protocol::ResultSet;
+pub use protocol::ResultRow;
+pub use protocol::SSLRequestPacket;
+pub use protocol::Decoder;
+pub use protocol::DeContext;
+pub use protocol::Deserialize;
+pub use protocol::Encoder;
+pub use protocol::ErrorCode;
+pub use protocol::Serialize;
+pub use protocol::Message;
+pub use protocol::Capabilities;
+pub use protocol::ServerStatusFlag;
+pub use protocol::FieldType;
+pub use protocol::FieldDetailFlag;
+pub use protocol::SessionChangeType;
+pub use protocol::TextProtocol;

src/mariadb/protocol/encode.rs

@@ -211,9 +211,9 @@ mod tests {
     #[test]
     fn it_encodes_int_lenenc_u8() {
         let mut encoder = Encoder::new(128);
-        encoder.encode_int_lenenc(Some(&(std::u8::MAX as usize)));
+        encoder.encode_int_lenenc(Some(&(0xFA as usize)));
 
-        assert_eq!(&encoder.buf[..], b"\xFA\xFF");
+        assert_eq!(&encoder.buf[..], b"\xFA");
     }
 
     #[test]
@@ -285,7 +285,7 @@ mod tests {
         let mut encoder = Encoder::new(128);
         encoder.encode_string_lenenc(&Bytes::from_static(b"random_string"));
 
-        assert_eq!(&encoder.buf[..], b"\x0D\x00\x00random_string");
+        assert_eq!(&encoder.buf[..], b"\x0Drandom_string");
     }
 
     #[test]

src/mariadb/protocol/mod.rs

@@ -7,3 +7,51 @@ pub mod packets;
 pub mod serialize;
 pub mod server;
 pub mod types;
+
+// Re-export all the things
+pub use packets::AuthenticationSwitchRequestPacket;
+pub use packets::ColumnPacket;
+pub use packets::ColumnDefPacket;
+pub use packets::ComDebug;
+pub use packets::ComInitDb;
+pub use packets::ComPing;
+pub use packets::ComProcessKill;
+pub use packets::ComQuery;
+pub use packets::ComQuit;
+pub use packets::ComResetConnection;
+pub use packets::ComSetOption;
+pub use packets::SetOptionOptions;
+pub use packets::ShutdownOptions;
+pub use packets::ComShutdown;
+pub use packets::ComSleep;
+pub use packets::ComStatistics;
+pub use packets::EofPacket;
+pub use packets::ErrPacket;
+pub use packets::HandshakeResponsePacket;
+pub use packets::InitialHandshakePacket;
+pub use packets::OkPacket;
+pub use packets::PacketHeader;
+pub use packets::ResultSet;
+pub use packets::ResultRow;
+pub use packets::SSLRequestPacket;
+
+pub use decode::Decoder;
+
+pub use deserialize::DeContext;
+pub use deserialize::Deserialize;
+
+pub use encode::Encoder;
+
+pub use error_codes::ErrorCode;
+
+pub use serialize::Serialize;
+
+pub use server::Message;
+
+pub use types::Capabilities;
+pub use types::ServerStatusFlag;
+pub use types::FieldType;
+pub use types::FieldDetailFlag;
+pub use types::SessionChangeType;
+
+pub use client::TextProtocol;

src/mariadb/protocol/packets/auth_switch_request.rs

@@ -1,5 +1,5 @@
-use super::super::serialize::Serialize;
-use crate::mariadb::connection::Connection;
+use crate::mariadb::Connection;
+use crate::mariadb::Serialize;
 use bytes::Bytes;
 use failure::Error;
 

src/mariadb/protocol/packets/column.rs

@@ -1,10 +1,11 @@
 use failure::Error;
 
-use super::super::deserialize::{DeContext, Deserialize};
+use crate::mariadb::{DeContext, Deserialize};
 
+// The column packet is the first packet of a result set.
+// Inside of it it contains the number of columns in the result set
+// encoded as an int<lenenc>.
 #[derive(Default, Debug, Clone, Copy)]
-// ColumnPacket doesn't have a packet header because
-// it's nested inside a result set packet
 pub struct ColumnPacket {
     pub length: u32,
     pub seq_no: u8,
@@ -29,9 +30,7 @@ mod test {
     use bytes::Bytes;
 
     use crate::ConnectOptions;
-
     use crate::{__bytes_builder, mariadb::connection::ConnContext, mariadb::protocol::decode::Decoder};
-
     use super::*;
 
     #[test]

src/mariadb/protocol/packets/column_def.rs

@@ -1,7 +1,4 @@
-use super::super::{
-    deserialize::{DeContext, Deserialize},
-    types::{FieldDetailFlag, FieldType},
-};
+use crate::mariadb::{DeContext, Deserialize, FieldDetailFlag, FieldType};
 use bytes::Bytes;
 use failure::Error;
 use std::convert::TryFrom;
@@ -78,9 +75,8 @@ impl Deserialize for ColumnDefPacket {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::{__bytes_builder, mariadb::connection::ConnContext, mariadb::protocol::decode::Decoder};
+    use crate::{__bytes_builder, ConnectOptions, mariadb::{ConnContext, Decoder}};
     use bytes::Bytes;
-    use crate::ConnectOptions;
 
     #[test]
     fn it_decodes_column_def_packet() -> Result<(), Error> {

src/mariadb/protocol/packets/com_debug.rs

@@ -1,5 +1,4 @@
-use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::mariadb::connection::Connection;
+use crate::mariadb::{Connection, TextProtocol, Serialize};
 use failure::Error;
 
 pub struct ComDebug();

src/mariadb/protocol/packets/com_init_db.rs

@@ -1,5 +1,4 @@
-use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::mariadb::connection::Connection;
+use crate::mariadb::{TextProtocol, Serialize, Connection};
 use bytes::Bytes;
 use failure::Error;
 

src/mariadb/protocol/packets/com_ping.rs

@@ -1,5 +1,4 @@
-use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::mariadb::connection::Connection;
+use crate::mariadb::{TextProtocol, Serialize, Connection};
 use failure::Error;
 
 pub struct ComPing();

src/mariadb/protocol/packets/com_process_kill.rs

@@ -1,5 +1,4 @@
-use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::mariadb::connection::Connection;
+use crate::mariadb::{TextProtocol, Serialize, Connection};
 use failure::Error;
 
 pub struct ComProcessKill {

src/mariadb/protocol/packets/com_query.rs

@@ -1,5 +1,4 @@
-use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::mariadb::connection::Connection;
+use crate::mariadb::{TextProtocol, Serialize, Connection};
 use bytes::Bytes;
 use failure::Error;
 

src/mariadb/protocol/packets/com_quit.rs

@@ -1,5 +1,4 @@
-use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::mariadb::connection::Connection;
+use crate::mariadb::{TextProtocol, Serialize, Connection};
 use failure::Error;
 
 pub struct ComQuit();

src/mariadb/protocol/packets/com_reset_conn.rs

@@ -1,5 +1,4 @@
-use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::mariadb::connection::Connection;
+use crate::mariadb::{TextProtocol, Serialize, Connection};
 use failure::Error;
 
 pub struct ComResetConnection();

src/mariadb/protocol/packets/com_set_option.rs

@@ -1,5 +1,4 @@
-use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::mariadb::connection::Connection;
+use crate::mariadb::{TextProtocol, Serialize, Connection};
 use failure::Error;
 
 #[derive(Clone, Copy)]

src/mariadb/protocol/packets/com_shutdown.rs

@@ -1,5 +1,4 @@
-use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::mariadb::connection::Connection;
+use crate::mariadb::{TextProtocol, Serialize, Connection};
 use failure::Error;
 
 #[derive(Clone, Copy)]

src/mariadb/protocol/packets/com_sleep.rs

@@ -1,5 +1,4 @@
-use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::mariadb::connection::Connection;
+use crate::mariadb::{TextProtocol, Serialize, Connection};
 use failure::Error;
 
 pub struct ComSleep();

src/mariadb/protocol/packets/com_statistics.rs

@@ -1,5 +1,4 @@
-use super::super::{client::TextProtocol, serialize::Serialize};
-use crate::mariadb::connection::Connection;
+use crate::mariadb::{TextProtocol, Serialize, Connection};
 use failure::Error;
 
 pub struct ComStatistics();

src/mariadb/protocol/packets/eof.rs

@@ -1,8 +1,5 @@
-use super::super::{
-    decode::Decoder,
-    deserialize::{DeContext, Deserialize},
-    error_codes::ErrorCode,
-    types::ServerStatusFlag,
+use crate::mariadb::{
+    Decoder, DeContext, Deserialize, ErrorCode, ServerStatusFlag,
 };
 use bytes::Bytes;
 use failure::Error;
@@ -39,9 +36,8 @@ impl Deserialize for EofPacket {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::{__bytes_builder, mariadb::connection::ConnContext};
+    use crate::{__bytes_builder, ConnectOptions, mariadb::ConnContext};
     use bytes::Bytes;
-    use crate::ConnectOptions;
 
     #[test]
     fn it_decodes_eof_packet() -> Result<(), Error> {

src/mariadb/protocol/packets/err.rs

@@ -3,9 +3,7 @@ use std::convert::TryFrom;
 use bytes::Bytes;
 use failure::Error;
 
-use super::super::{
-    deserialize::{DeContext, Deserialize},
-    error_codes::ErrorCode,
+use crate::mariadb::{DeContext, Deserialize, ErrorCode,
 };
 
 #[derive(Default, Debug)]
@@ -91,10 +89,7 @@ impl std::fmt::Display for ErrPacket {
 mod test {
     use bytes::Bytes;
 
-    use crate::ConnectOptions;
-
-    use crate::{__bytes_builder, mariadb::connection::ConnContext, mariadb::protocol::decode::Decoder};
-
+    use crate::{__bytes_builder, ConnectOptions, mariadb::{ConnContext, Decoder}};
     use super::*;
 
     #[test]

src/mariadb/protocol/packets/handshake_response.rs

@@ -1,5 +1,4 @@
-use super::super::{serialize::Serialize, types::Capabilities};
-use crate::mariadb::connection::Connection;
+use crate::mariadb::{Serialize, Capabilities, Connection};
 use bytes::Bytes;
 use failure::Error;
 

src/mariadb/protocol/packets/initial.rs

@@ -1,6 +1,4 @@
-use super::super::{
-    deserialize::{DeContext, Deserialize},
-    types::{Capabilities, ServerStatusFlag},
+use crate::mariadb::{DeContext, Deserialize, Capabilities, ServerStatusFlag
 };
 use bytes::Bytes;
 use failure::{err_msg, Error};
@@ -102,9 +100,8 @@ impl Deserialize for InitialHandshakePacket {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::{__bytes_builder, mariadb::connection::ConnContext, mariadb::protocol::decode::Decoder};
+    use crate::{__bytes_builder, ConnectOptions, mariadb::{ConnContext, Decoder}};
     use bytes::BytesMut;
-    use crate::ConnectOptions;
 
     #[test]
     fn it_decodes_initial_handshake_packet() -> Result<(), Error> {

src/mariadb/protocol/packets/ok.rs

@@ -1,9 +1,7 @@
 use bytes::Bytes;
 use failure::{err_msg, Error};
 
-use super::super::{
-    deserialize::{DeContext, Deserialize},
-    types::ServerStatusFlag,
+use crate::mariadb::{DeContext, Deserialize, ServerStatusFlag,
 };
 
 #[derive(Default, Debug)]
@@ -63,10 +61,7 @@ impl Deserialize for OkPacket {
 
 #[cfg(test)]
 mod test {
-    use crate::ConnectOptions;
-
-    use crate::{__bytes_builder, mariadb::connection::ConnContext, mariadb::protocol::decode::Decoder};
-
+    use crate::{__bytes_builder, ConnectOptions, mariadb::{ConnContext, Decoder}};
     use super::*;
 
     #[test]

src/mariadb/protocol/packets/result_row.rs

@@ -1,8 +1,5 @@
-use super::super::{
-    decode::Decoder,
-    deserialize::{DeContext, Deserialize},
-    error_codes::ErrorCode,
-    types::ServerStatusFlag,
+use crate::mariadb::{
+    Decoder, DeContext, Deserialize, ErrorCode, ServerStatusFlag,
 };
 use bytes::Bytes;
 use failure::Error;
@@ -35,9 +32,8 @@ impl Deserialize for ResultRow {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::{__bytes_builder, mariadb::connection::ConnContext, mariadb::protocol::decode::Decoder};
+    use crate::{__bytes_builder, ConnectOptions, mariadb::{ConnContext, Decoder}};
     use bytes::Bytes;
-    use crate::ConnectOptions;
 
     #[test]
     fn it_decodes_result_row_packet() -> Result<(), Error> {

src/mariadb/protocol/packets/result_set.rs

@@ -1,9 +1,9 @@
 use bytes::Bytes;
 use failure::Error;
 
-use crate::mariadb::protocol::decode::Decoder;
-use crate::mariadb::protocol::server::Message;
-use crate::mariadb::protocol::types::Capabilities;
+use crate::mariadb::Decoder;
+use crate::mariadb::Message;
+use crate::mariadb::Capabilities;
 
 use super::super::{
     deserialize::{DeContext, Deserialize},
@@ -80,12 +80,7 @@ impl Deserialize for ResultSet {
 mod test {
     use bytes::{BufMut, Bytes};
 
-    use crate::__bytes_builder;
-    use crate::mariadb::{connection::Connection};
-    use crate::mariadb::protocol::packets::{eof::EofPacket, err::ErrPacket, ok::OkPacket, result_row::ResultRow};
-    use crate::mariadb::protocol::types::{ServerStatusFlag, Capabilities};
-    use crate::mariadb::connection::ConnContext;
-
+    use crate::{__bytes_builder, mariadb::{Connection, EofPacket, ErrPacket, OkPacket, ResultRow, ServerStatusFlag, Capabilities, ConnContext}};
     use super::*;
 
     #[test]

src/mariadb/protocol/packets/ssl_request.rs

@@ -1,8 +1,8 @@
-use super::super::{serialize::Serialize, types::Capabilities};
-use crate::mariadb::connection::Connection;
 use bytes::Bytes;
 use failure::Error;
 
+use crate::mariadb::{Capabilities, Connection, Serialize};
+
 #[derive(Default, Debug)]
 pub struct SSLRequestPacket {
     pub capabilities: Capabilities,