Merge pull request #90 from zslayton/revert-87-master

Revert "upgraded to mio v0.4"

Cargo.toml

@@ -16,4 +16,4 @@ name = "stomp"
 "lifeguard" = "*"
 "unicode-segmentation" = "*"
 "log" = "*"
-"mio" = "~0.4.0"
+"mio" = "*"

src/connection.rs

@@ -1,5 +1,5 @@
 //use std::old_io::net::tcp::TcpStream;
-use mio::tcp::{TcpStream};
+use std::net::TcpStream;
 use std::io::BufReader;
 use std::io::BufWriter;
 use frame::Transmission;
@@ -24,8 +24,7 @@ pub struct Credentials<'a>(pub &'a str, pub &'a str);
 impl Connection {
 
   pub fn new(ip_address: &str, port: u16) -> Result<Connection> {
-    let addr = (ip_address.to_string() + ":" + &port.to_string()).parse().unwrap();
-    let tcp_stream = try!(TcpStream::connect(&addr));
+    let tcp_stream = try!(TcpStream::connect((ip_address, port)));
     Ok(Connection {
       ip_address: ip_address.to_string(),
       port: port,

src/session.rs

@@ -27,7 +27,7 @@ use message_builder::MessageBuilder;
 use subscription_builder::SubscriptionBuilder;
 use frame_buffer::FrameBuffer;
 
-use mio::{EventLoop, Handler, Token, EventSet, Timeout};
+use mio::{EventLoop, Handler, Token, ReadHint, Timeout};
 
 pub trait FrameHandler {
   fn on_frame(&mut self, &Frame);
@@ -98,7 +98,7 @@ impl <'a> Handler for Session<'a> {
     }
   }
 
-  fn ready(&mut self, event_loop: &mut EventLoop<Session<'a>>, _token: Token, _: EventSet) {
+  fn readable(&mut self, event_loop: &mut EventLoop<Session<'a>>, _token: Token, _: ReadHint) {
     debug!("Readable! Buffer size: {}", &mut self.read_buffer.len());
     debug!("Frame buffer length: {}", &mut self.frame_buffer.len());
     let bytes_read = match self.connection.tcp_stream.read(self.read_buffer.deref_mut()){