Update for rustc and gl-rs

src/x11/ffi.rs

@@ -9,22 +9,22 @@ use libc;
 /// GLX bindings
 pub mod glx {
     generate_gl_bindings! {
-        api: glx,
-        profile: core,
-        version: 1.4,
-        generator: static
+        api: "glx",
+        profile: "core",
+        version: "1.4",
+        generator: "static"
     }
 }
 
 /// Functions that are not necessarly always available
 pub mod glx_extra {
     generate_gl_bindings! {
-        api: glx,
-        profile: core,
-        version: 1.4,
-        generator: struct,
+        api: "glx",
+        profile: "core",
+        version: "1.4",
+        generator: "struct",
         extensions: [
-            GLX_ARB_create_context
+            "GLX_ARB_create_context"
         ]
     }
 }

src/x11/window/mod.rs

@@ -1,7 +1,7 @@
 use {Event, WindowBuilder};
 use libc;
 use std::{mem, ptr};
-use std::sync::atomics::AtomicBool;
+use std::sync::atomic::AtomicBool;
 use super::ffi;
 
 pub use self::monitor::{MonitorID, get_available_monitors, get_primary_monitor};
@@ -260,7 +260,7 @@ impl Window {
     }
 
     pub fn is_closed(&self) -> bool {
-        use std::sync::atomics::Relaxed;
+        use std::sync::atomic::Relaxed;
         self.is_closed.load(Relaxed)
     }
 
@@ -340,7 +340,7 @@ impl Window {
 
                 ffi::ClientMessage => {
                     use Closed;
-                    use std::sync::atomics::Relaxed;
+                    use std::sync::atomic::Relaxed;
 
                     let client_msg: &ffi::XClientMessageEvent = unsafe { mem::transmute(&xev) };