Update most remaining deps

Cargo.toml

@@ -12,30 +12,32 @@ path = "src/main.rs"
 name = "alacritty"
 
 [dependencies]
-libc = "0.2.23"
+libc = "0.2.30"
-cgmath = "0.7"
+cgmath = "0.15"
 notify = "2.6"
-bitflags = "0.7"
+bitflags = "0.9.1"
 font = { path = "./font" }
-errno = "0.2"
+errno = "0.2.3"
-parking_lot = "0.3.1"
+parking_lot = "0.4.5"
 serde = "1"
 serde_derive = "1"
 serde_json = "1"
-serde_yaml = "0.7"
+serde_yaml = "0.7.1"
-vte = "0.3.0"
+vte = "0.3.2"
-mio = "=0.6.2"
+mio = "0.6.10"
+mio-more = "0.1.0"
 copypasta = { path = "./copypasta" }
-xdg = "2.0.0"
+xdg = "2"
-log = "0.3"
+log = "0.3.8"
-clap = "2.20"
+clap = "2"
-fnv = "1.0.5"
+fnv = "1"
 unicode-width = "0.1.4"
-arraydeque = "0.2"
+arraydeque = "0.2.3"
-clippy = { version = "0.0.104", optional = true }
+glutin = "0.9.2"
+clippy = { version = "0.0.155", optional = true }
 
 [target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os="dragonfly", target_os="openbsd"))'.dependencies]
-x11-dl = "2.12.0"
+x11-dl = "2"
 
 [features]
 default = ["err-println"]
@@ -46,10 +48,7 @@ nightly = []
 bench = []
 
 [build-dependencies]
-gl_generator = "0.5"
+gl_generator = "0.5.5"
-
-[dependencies.glutin]
-version = "0.9"
 
 [profile.release]
 lto = true

src/event_loop.rs

@@ -7,7 +7,10 @@ use std::os::unix::io::AsRawFd;
 use std::sync::Arc;
 
 use mio::{self, Events, PollOpt, Ready};
+#[cfg(unix)]
+use mio::unix::UnixReady;
 use mio::unix::EventedFd;
+use mio_more::channel::{self, Sender, Receiver};
 
 use ansi;
 use display;
@@ -33,8 +36,8 @@ pub enum Msg {
 pub struct EventLoop<Io> {
     poll: mio::Poll,
     pty: Io,
-    rx: mio::channel::Receiver<Msg>,
+    rx: Receiver<Msg>,
-    tx: mio::channel::Sender<Msg>,
+    tx: Sender<Msg>,
     terminal: Arc<FairMutex<Term>>,
     display: display::Notifier,
     ref_test: bool,
@@ -76,7 +79,7 @@ pub struct State {
     parser: ansi::Processor,
 }
 
-pub struct Notifier(pub ::mio::channel::Sender<Msg>);
+pub struct Notifier(pub Sender<Msg>);
 
 impl event::Notify for Notifier {
     fn notify<B>(&mut self, bytes: B)
@@ -174,7 +177,7 @@ impl<Io> EventLoop<Io>
         pty: Io,
         ref_test: bool,
     ) -> EventLoop<Io> {
-        let (tx, rx) = ::mio::channel::channel();
+        let (tx, rx) = channel::channel();
         EventLoop {
             poll: mio::Poll::new().expect("create mio Poll"),
             pty: pty,
@@ -186,7 +189,7 @@ impl<Io> EventLoop<Io>
         }
     }
 
-    pub fn channel(&self) -> mio::channel::Sender<Msg> {
+    pub fn channel(&self) -> Sender<Msg> {
         self.tx.clone()
     }
 
@@ -384,13 +387,15 @@ impl<Io> EventLoop<Io>
                             }
                         },
                         PTY => {
-                            let kind = event.kind();
+                            let ready = event.readiness();
 
-                            if kind.is_hup() {
+                            #[cfg(unix)] {
-                                break 'event_loop;
+                                if UnixReady::from(ready).is_hup() {
+                                    break 'event_loop;
+                                }
                             }
 
-                            if kind.is_readable() {
+                            if ready.is_readable() {
                                 if let Err(err) = self.pty_read(&mut state, &mut buf, pipe.as_mut()) {
                                     error!("Event loop exitting due to error: {} [{}:{}]",
                                            err, file!(), line!());
@@ -402,7 +407,7 @@ impl<Io> EventLoop<Io>
                                 }
                             }
 
-                            if kind.is_writable() {
+                            if ready.is_writable() {
                                 if let Err(err) = self.pty_write(&mut state) {
                                     error!("Event loop exitting due to error: {} [{}:{}]",
                                            err, file!(), line!());

src/lib.rs

@@ -39,6 +39,7 @@ extern crate font;
 extern crate glutin;
 extern crate libc;
 extern crate mio;
+extern crate mio_more;
 extern crate notify;
 extern crate parking_lot;
 extern crate serde;

src/term/cell.rs

@@ -17,16 +17,16 @@ use index::Column;
 
 bitflags! {
     #[derive(Serialize, Deserialize)]
-    pub flags Flags: u32 {
+    pub struct Flags: u32 {
-        const INVERSE           = 0b00000001,
+        const INVERSE           = 0b00000001;
-        const BOLD              = 0b00000010,
+        const BOLD              = 0b00000010;
-        const ITALIC            = 0b00000100,
+        const ITALIC            = 0b00000100;
-        const UNDERLINE         = 0b00001000,
+        const UNDERLINE         = 0b00001000;
-        const WRAPLINE          = 0b00010000,
+        const WRAPLINE          = 0b00010000;
-        const WIDE_CHAR         = 0b00100000,
+        const WIDE_CHAR         = 0b00100000;
-        const WIDE_CHAR_SPACER  = 0b01000000,
+        const WIDE_CHAR_SPACER  = 0b01000000;
-        const DIM               = 0b10000000,
+        const DIM               = 0b10000000;
-        const DIM_BOLD          = 0b10000010,
+        const DIM_BOLD          = 0b10000010;
     }
 }
 

src/term/mod.rs

@@ -390,21 +390,21 @@ impl<'a> Iterator for RenderableCellsIter<'a> {
 
 pub mod mode {
     bitflags! {
-        pub flags TermMode: u16 {
+        pub struct TermMode: u16 {
-            const SHOW_CURSOR         = 0b000000000001,
+            const SHOW_CURSOR         = 0b000000000001;
-            const APP_CURSOR          = 0b000000000010,
+            const APP_CURSOR          = 0b000000000010;
-            const APP_KEYPAD          = 0b000000000100,
+            const APP_KEYPAD          = 0b000000000100;
-            const MOUSE_REPORT_CLICK  = 0b000000001000,
+            const MOUSE_REPORT_CLICK  = 0b000000001000;
-            const BRACKETED_PASTE     = 0b000000010000,
+            const BRACKETED_PASTE     = 0b000000010000;
-            const SGR_MOUSE           = 0b000000100000,
+            const SGR_MOUSE           = 0b000000100000;
-            const MOUSE_MOTION        = 0b000001000000,
+            const MOUSE_MOTION        = 0b000001000000;
-            const LINE_WRAP           = 0b000010000000,
+            const LINE_WRAP           = 0b000010000000;
-            const LINE_FEED_NEW_LINE  = 0b000100000000,
+            const LINE_FEED_NEW_LINE  = 0b000100000000;
-            const ORIGIN              = 0b001000000000,
+            const ORIGIN              = 0b001000000000;
-            const INSERT              = 0b010000000000,
+            const INSERT              = 0b010000000000;
-            const FOCUS_IN_OUT        = 0b100000000000,
+            const FOCUS_IN_OUT        = 0b100000000000;
-            const ANY                 = 0b111111111111,
+            const ANY                 = 0b111111111111;
-            const NONE                = 0,
+            const NONE                = 0;
         }
     }