Fix compilation

There was a version mismatch because of outdated redox_event and some issues with the Cargo.lock that `cargo update` fixed

alxd/Cargo.toml

@@ -4,6 +4,6 @@ version = "0.1.0"
 
 [dependencies]
 bitflags = "0.7"
-netutils = { git = "https://github.com/redox-os/netutils.git" }
-redox_event = { git = "https://github.com/redox-os/event.git" }
+netutils = { git = "https://gitlab.redox-os.org/redox-os/netutils.git" }
+redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" }
 redox_syscall = "0.1"

e1000d/Cargo.toml

@@ -4,6 +4,6 @@ version = "0.1.0"
 
 [dependencies]
 bitflags = "0.7"
-netutils = { git = "https://github.com/redox-os/netutils.git" }
-redox_event = { git = "https://github.com/redox-os/event.git" }
+netutils = { git = "https://gitlab.redox-os.org/redox-os/netutils.git" }
+redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" }
 redox_syscall = "0.1"

ihdad/Cargo.toml

@@ -5,6 +5,6 @@ version = "0.1.0"
 [dependencies]
 bitflags = "0.7"
 spin = "0.4"
-redox_event = { git = "https://github.com/redox-os/event.git" }
+redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" }
 redox_syscall = "0.1"
 

ps2d/Cargo.toml

@@ -5,5 +5,5 @@ version = "0.1.0"
 [dependencies]
 bitflags = "0.7"
 orbclient = "0.3"
-redox_event = { git = "https://github.com/redox-os/event.git" }
+redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" }
 redox_syscall = "0.1"

rtl8168d/Cargo.toml

@@ -4,6 +4,6 @@ version = "0.1.0"
 
 [dependencies]
 bitflags = "0.7"
-netutils = { git = "https://github.com/redox-os/netutils.git" }
-redox_event = { git = "https://github.com/redox-os/event.git" }
+netutils = { git = "https://gitlab.redox-os.org/redox-os/netutils.git" }
+redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" }
 redox_syscall = "0.1"

vboxd/Cargo.toml

@@ -4,5 +4,5 @@ version = "0.1.0"
 
 [dependencies]
 orbclient = "0.3"
-redox_event = { git = "https://github.com/redox-os/event.git" }
+redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" }
 redox_syscall = "0.1"

xhcid/Cargo.toml

@@ -6,5 +6,5 @@ version = "0.1.0"
 bitflags = "0.7"
 plain = "0.2"
 spin = "0.4"
-redox_event = "0.1"
+redox_event = { git = "https://gitlab.redox-os.org/redox-os/event.git" }
 redox_syscall = "0.1"

xhcid/src/main.rs

@@ -4,7 +4,7 @@ extern crate event;
 extern crate plain;
 extern crate syscall;
 
-use event::EventQueue;
+use event::{Event, EventQueue};
 use std::cell::RefCell;
 use std::env;
 use std::fs::File;
@@ -56,7 +56,7 @@ fn main() {
             let hci_irq = hci.clone();
             let socket_irq = socket.clone();
             let todo_irq = todo.clone();
-            event_queue.add(irq_file.as_raw_fd(), move |_count: usize| -> Result<Option<()>> {
+            event_queue.add(irq_file.as_raw_fd(), move |_| -> Result<Option<()>> {
                 let mut irq = [0; 8];
                 irq_file.read(&mut irq)?;
 
@@ -83,7 +83,7 @@ fn main() {
 
             let socket_fd = socket.borrow().as_raw_fd();
             let socket_packet = socket.clone();
-            event_queue.add(socket_fd, move |_count: usize| -> Result<Option<()>> {
+            event_queue.add(socket_fd, move |_| -> Result<Option<()>> {
                 loop {
                     let mut packet = Packet::default();
                     if socket_packet.borrow_mut().read(&mut packet)? == 0 {
@@ -102,7 +102,10 @@ fn main() {
                 Ok(None)
             }).expect("xhcid: failed to catch events on scheme file");
 
-            event_queue.trigger_all(0).expect("xhcid: failed to trigger events");
+            event_queue.trigger_all(Event {
+                fd: 0,
+                flags: 0
+            }).expect("xhcid: failed to trigger events");
 
             event_queue.run().expect("xhcid: failed to handle events");
         }