Merge pull request #159 from tox-rs/update_deps

chore(deps): update deps of the project

Author: kpp

Cargo.toml

@@ -34,12 +34,12 @@ byteorder = "1"
 futures = "0.1"
 log = "0.4"
 sodiumoxide = "0.0.16"
-tokio = "0.1"
-tokio-io = "0.1"
-nom = "3.2"
+tokio = "0.1.7"
+tokio-codec = "0.1"
+nom = "3.2.1"
 cookie-factory = "0.2.3"
-get_if_addrs = "0.5.1"
-parking_lot = "0.5"
+get_if_addrs = "0.5.3"
+parking_lot = "0.6"
 failure = "0.1"
 
 [dev-dependencies]

examples/dht_server.rs

@@ -26,7 +26,6 @@ extern crate tox;
 extern crate failure;
 extern crate futures;
 extern crate tokio;
-extern crate tokio_io;
 extern crate hex;
 
 #[macro_use]

examples/tcp_client.rs

@@ -21,7 +21,7 @@
 extern crate tox;
 extern crate futures;
 extern crate tokio;
-extern crate tokio_io;
+extern crate tokio_codec;
 
 #[macro_use]
 extern crate log;
@@ -40,7 +40,7 @@ use futures::prelude::*;
 use futures::future;
 use futures::sync::mpsc;
 
-use tokio_io::AsyncRead;
+use tokio_codec::Framed;
 use tokio::net::TcpStream;
 
 use std::{thread, time};
@@ -99,7 +99,7 @@ fn create_client(rx: mpsc::Receiver<Packet>, tx: mpsc::Sender<Packet>) -> IoFutu
         .and_then(|(socket, channel)| {
             debug!("Handshake complited");
 
-            let secure_socket = socket.framed(codec::Codec::new(channel));
+            let secure_socket = Framed::new(socket, codec::Codec::new(channel));
             let (to_server, from_server) = secure_socket.split();
 
             let reader = from_server.for_each(move |packet| -> IoFuture<()> {

examples/tcp_connection.rs

@@ -21,7 +21,7 @@
 extern crate tox;
 extern crate futures;
 extern crate tokio;
-extern crate tokio_io;
+extern crate tokio_codec;
 extern crate env_logger;
 
 use tox::toxcore::crypto_core::{PublicKey, SecretKey};
@@ -32,7 +32,7 @@ use tox::toxcore::tcp::client::*;
 
 use futures::{Future, Sink, Stream};
 
-use tokio_io::AsyncRead;
+use tokio_codec::Framed;
 use tokio::net::TcpStream;
 
 use std::io::{Error, ErrorKind};
@@ -74,7 +74,7 @@ fn main() {
             make_client_handshake(socket, client_pk, client_sk, server_pk)
         })
         .and_then(|(socket, channel)| {
-            let secure_socket = socket.framed(codec::Codec::new(channel));
+            let secure_socket = Framed::new(socket, codec::Codec::new(channel));
             let (to_server, from_server) = secure_socket.split();
 
             let writer = to_server_rx

examples/tcp_server.rs

@@ -21,6 +21,7 @@
 extern crate tox;
 extern crate futures;
 extern crate tokio;
+extern crate tokio_codec;
 
 #[macro_use]
 extern crate log;
@@ -35,7 +36,7 @@ use futures::prelude::*;
 
 use tokio::util::FutureExt;
 use tokio::net::TcpListener;
-use tokio::io::AsyncRead;
+use tokio_codec::Framed;
 
 use std::time;
 use std::io::{Error, ErrorKind};
@@ -81,7 +82,7 @@ fn main() {
 
         let server_inner_c = server_inner.clone();
         let process = register_client.and_then(move |(socket, channel, client_pk)| {
-            let secure_socket = socket.framed(codec::Codec::new(channel));
+            let secure_socket = Framed::new(socket, codec::Codec::new(channel));
             let (to_client, from_client) = secure_socket.split();
             let ServerProcessor { from_client_tx, to_client_rx, processor } =
                 ServerProcessor::create(

src/lib.rs

@@ -56,7 +56,7 @@ extern crate sodiumoxide;
 extern crate quickcheck;
 
 extern crate tokio;
-extern crate tokio_io;
+extern crate tokio_codec;
 extern crate get_if_addrs;
 extern crate parking_lot;
 #[macro_use]

src/toxcore/dht/codec.rs

@@ -31,7 +31,7 @@ use bytes::BytesMut;
 use cookie_factory::GenError;
 use failure::Error;
 use nom::{ErrorKind, Needed};
-use tokio_io::codec::{Decoder, Encoder};
+use tokio_codec::{Decoder, Encoder};
 
 /// A serialized `DhtPacket` should be not longer than 2048 bytes.
 pub const MAX_DHT_PACKET_SIZE: usize = 2048;

src/toxcore/tcp/codec.rs

@@ -28,7 +28,7 @@ use toxcore::tcp::secure::*;
 use nom::Offset;
 use std::io::{Error, ErrorKind};
 use bytes::BytesMut;
-use tokio_io::codec::{Decoder, Encoder};
+use tokio_codec::{Decoder, Encoder};
 
 /// implements tokio-io's Decoder and Encoder to deal with Packet
 pub struct Codec {

src/toxcore/tcp/handshake/codec.rs

@@ -28,7 +28,7 @@ use toxcore::tcp::handshake::packet::*;
 use nom::Offset;
 use bytes::BytesMut;
 use std::io::{Error, ErrorKind};
-use tokio_io::codec::{Decoder, Encoder};
+use tokio_codec::{Decoder, Encoder};
 
 /// implements tokio-io's Decoder and Encoder to deal with Client handshake
 pub struct ClientHandshakeCodec;
@@ -112,10 +112,9 @@ impl Encoder for ServerHandshakeCodec {
 
 #[cfg(test)]
 mod tests {
-    use ::toxcore::tcp::handshake::*;
+    use ::toxcore::tcp::handshake::codec::*;
     use ::toxcore::crypto_core::*;
     use bytes::BytesMut;
-    use tokio_io::codec::*;
 
     #[test]
     fn client_encode_decode() {

src/toxcore/tcp/handshake/mod.rs

@@ -36,7 +36,7 @@ use toxcore::io_tokio::IoFuture;
 
 use futures::{self, Stream, Sink, Future};
 use std::io::{Error, ErrorKind};
-use tokio::io::AsyncRead;
+use tokio_codec::Framed;
 use tokio::net::TcpStream;
 
 /// Create a handshake from client to server
@@ -124,7 +124,7 @@ pub fn make_client_handshake(socket: TcpStream,
     let res = futures::done(create_client_handshake(client_pk, client_sk, server_pk))
         .and_then(|(session, common_key, handshake)| {
             // send handshake
-            socket.framed(ClientHandshakeCodec)
+            Framed::new(socket, ClientHandshakeCodec)
                 .send(handshake)
                 .map_err(|e| {
                     Error::new(
@@ -138,7 +138,7 @@ pub fn make_client_handshake(socket: TcpStream,
         })
         .and_then(|(socket, session, common_key)| {
             // receive handshake from server
-            socket.framed(ServerHandshakeCodec)
+            Framed::new(socket, ServerHandshakeCodec)
                 .into_future()
                 .map_err(|(e, _socket)| {
                     Error::new(
@@ -169,7 +169,7 @@ pub fn make_client_handshake(socket: TcpStream,
 pub fn make_server_handshake(socket: TcpStream,
                             server_sk: SecretKey)
     -> IoFuture<(TcpStream, secure::Channel, PublicKey)> {
-    let res = socket.framed(ClientHandshakeCodec)
+    let res = Framed::new(socket, ClientHandshakeCodec)
         .into_future() // receive handshake from client
         .map_err(|(e, _socket)| {
             Error::new(
@@ -193,7 +193,7 @@ pub fn make_server_handshake(socket: TcpStream,
         })
         .and_then(|(socket, channel, client_pk, server_handshake)| {
             // send handshake
-            socket.framed(ServerHandshakeCodec)
+            Framed::new(socket, ServerHandshakeCodec)
                 .send(server_handshake)
                 .map_err(|e| {
                     Error::new(