diff options
| -rw-r--r-- | src/android/mod.rs | 10 | ||||
| -rw-r--r-- | src/lib.rs | 2 | ||||
| -rw-r--r-- | src/x11/window/mod.rs | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/android/mod.rs b/src/android/mod.rs index 4e24c98..341187f 100644 --- a/src/android/mod.rs +++ b/src/android/mod.rs @@ -104,12 +104,12 @@ impl Window { let config = unsafe { let mut attribute_list = vec!(); if use_gles2 { - attribute_list.push_all([ffi::egl::RENDERABLE_TYPE as i32, + attribute_list.push_all(&[ffi::egl::RENDERABLE_TYPE as i32, ffi::egl::OPENGL_ES2_BIT as i32]); } - attribute_list.push_all([ffi::egl::RED_SIZE as i32, 1]); - attribute_list.push_all([ffi::egl::GREEN_SIZE as i32, 1]); - attribute_list.push_all([ffi::egl::BLUE_SIZE as i32, 1]); + attribute_list.push_all(&[ffi::egl::RED_SIZE as i32, 1]); + attribute_list.push_all(&[ffi::egl::GREEN_SIZE as i32, 1]); + attribute_list.push_all(&[ffi::egl::BLUE_SIZE as i32, 1]); attribute_list.push(ffi::egl::NONE as i32); let mut num_config: ffi::egl::types::EGLint = mem::uninitialized(); @@ -132,7 +132,7 @@ impl Window { let context = unsafe { let mut context_attributes = vec!(); if use_gles2 { - context_attributes.push_all([ffi::egl::CONTEXT_CLIENT_VERSION as i32, 2]); + context_attributes.push_all(&[ffi::egl::CONTEXT_CLIENT_VERSION as i32, 2]); } context_attributes.push(ffi::egl::NONE as i32); @@ -42,8 +42,6 @@ extern crate cocoa; extern crate core_foundation; #[cfg(target_os = "macos")] extern crate core_graphics; -#[cfg(target_os = "linux")] -extern crate sync; pub use events::*; diff --git a/src/x11/window/mod.rs b/src/x11/window/mod.rs index 668cd03..8662fdc 100644 --- a/src/x11/window/mod.rs +++ b/src/x11/window/mod.rs @@ -6,7 +6,7 @@ use std::{mem, ptr}; use std::cell::Cell; use std::sync::atomic::AtomicBool; use super::ffi; -use sync::one::{Once, ONCE_INIT}; +use std::sync::{Once, ONCE_INIT}; pub use self::monitor::{MonitorID, get_available_monitors, get_primary_monitor}; |