refactor: unify binary_io between tcp and dht modules

src/lib.rs

@@ -178,6 +178,7 @@ pub mod toxcore_tests {
 pub mod toxcore {
     #[macro_use]
     pub mod binary_io;
+    pub mod binary_io_new;
     pub mod crypto_core;
     pub mod dht;
     pub mod dht_node;

src/toxcore/dht_new/binary_io.rs → src/toxcore/binary_io_new.rs

@@ -19,12 +19,11 @@
     along with Tox.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/*! Encoding/decoding traits for TCP mod
+/*! Encoding/decoding traits
 */
 
-// FIXME: merge with toxcore/binary_io.rs
-
 use toxcore::crypto_core::*;
+
 pub use nom::IResult;
 pub use cookie_factory::GenError;
 

src/toxcore/dht_new/mod.rs

@@ -24,6 +24,5 @@
 */
 
 pub mod packet;
-pub mod binary_io;
 pub mod kbucket;
 pub mod packed_node;

src/toxcore/dht_new/packed_node.rs

@@ -33,7 +33,7 @@ use std::net::{
     SocketAddr,
 };
 
-use toxcore::dht_new::binary_io::*;
+use toxcore::binary_io_new::*;
 use toxcore::crypto_core::*;
 
 /** `PackedNode` format is a way to store the node info in a small yet easy to

src/toxcore/dht_new/packet.rs

@@ -45,7 +45,7 @@ use std::net::{
     Ipv6Addr,
 };
 
-use toxcore::dht_new::binary_io::*;
+use toxcore::binary_io_new::*;
 use toxcore::crypto_core::*;
 use toxcore::dht_new::packed_node::PackedNode;
 

src/toxcore/tcp/codec.rs

@@ -22,9 +22,9 @@
 /*! Codec implementation for encoding/decoding TCP Packets in terms of tokio-io
 */
 
+use toxcore::binary_io_new::*;
 use toxcore::tcp::packet::*;
 use toxcore::tcp::secure::*;
-use toxcore::tcp::binary_io::*;
 
 use nom::Offset;
 use std::io::{Error, ErrorKind};

src/toxcore/tcp/handshake/codec.rs

@@ -23,8 +23,8 @@
 
 */
 
+use toxcore::binary_io_new::*;
 use toxcore::tcp::handshake::packet::*;
-use toxcore::tcp::binary_io::*;
 
 use nom::Offset;
 use bytes::BytesMut;

src/toxcore/tcp/handshake/packet.rs

@@ -24,8 +24,8 @@ handshake using [`diagram`](https://zetok.github.io/tox-spec/#handshake-diagram)
 
 */
 
+use toxcore::binary_io_new::*;
 use toxcore::crypto_core::*;
-use toxcore::tcp::binary_io::*;
 
 /** The request of the client to create a TCP handshake.
 

src/toxcore/tcp/mod.rs

@@ -23,17 +23,16 @@
 
 */
 
+use toxcore::binary_io_new::*;
 use toxcore::crypto_core::*;
 
-pub mod binary_io;
 pub mod handshake;
 pub mod secure;
 pub mod packet;
 pub mod codec;
 pub mod server;
 
 use self::handshake::*;
-use self::binary_io::*;
 
 use futures::{self, Stream, Sink, Future};
 use std::io::{Error, ErrorKind};

src/toxcore/tcp/packet.rs

@@ -23,8 +23,8 @@
     to [Tox spec](https://zetok.github.io/tox-spec/#encrypted-payload-types)
 */
 
+use toxcore::binary_io_new::*;
 use toxcore::crypto_core::*;
-use toxcore::tcp::binary_io::*;
 
 use nom::{be_u8, be_u16, be_u64, rest};