From 0389c834e4b456ad6dcce4f687c69ab0e84beafa Mon Sep 17 00:00:00 2001 From: mitchmindtree Date: Sun, 22 Feb 2015 00:40:23 +1100 Subject: RingBuf -> VecDeque for other platforms, as_slice_with_nul -> as_bytes_with_nul --- src/android/mod.rs | 8 ++++---- src/win32/init.rs | 2 +- src/win32/mod.rs | 4 ++-- src/win32/monitor.rs | 6 +++--- src/x11/headless.rs | 2 +- src/x11/window/mod.rs | 8 ++++---- src/x11/window/monitor.rs | 6 +++--- 7 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/android/mod.rs b/src/android/mod.rs index 30e6c08..563ca50 100644 --- a/src/android/mod.rs +++ b/src/android/mod.rs @@ -9,7 +9,7 @@ use events::ElementState::{Pressed, Released}; use events::Event::{MouseInput, MouseMoved}; use events::MouseButton; -use std::collections::RingBuf; +use std::collections::VecDeque; use Api; use BuilderAttribs; @@ -26,8 +26,8 @@ pub struct MonitorID; mod ffi; -pub fn get_available_monitors() -> RingBuf { - let mut rb = RingBuf::new(); +pub fn get_available_monitors() -> VecDeque { + let mut rb = VecDeque::new(); rb.push_back(MonitorID); rb } @@ -313,7 +313,7 @@ impl Window { pub fn get_proc_address(&self, addr: &str) -> *const () { let addr = CString::from_slice(addr.as_bytes()); - let addr = addr.as_slice_with_nul().as_ptr(); + let addr = addr.as_bytes_with_nul().as_ptr(); unsafe { ffi::egl::GetProcAddress(addr) as *const () } diff --git a/src/win32/init.rs b/src/win32/init.rs index 246a6b7..fd454d3 100644 --- a/src/win32/init.rs +++ b/src/win32/init.rs @@ -171,7 +171,7 @@ fn init(title: Vec, builder: BuilderAttribs<'static>, builder_sharelists: O use libc; let addr = CString::from_slice(addr.as_bytes()); - let addr = addr.as_slice_with_nul().as_ptr(); + let addr = addr.as_bytes_with_nul().as_ptr(); unsafe { gl::wgl::GetProcAddress(addr) as *const libc::c_void diff --git a/src/win32/mod.rs b/src/win32/mod.rs index cfb573a..e47c6eb 100644 --- a/src/win32/mod.rs +++ b/src/win32/mod.rs @@ -1,7 +1,7 @@ use std::sync::atomic::AtomicBool; use std::ptr; use std::ffi::CString; -use std::collections::RingBuf; +use std::collections::VecDeque; use std::sync::mpsc::Receiver; use libc; use {CreationError, Event, MouseCursor}; @@ -192,7 +192,7 @@ impl Window { /// See the docs in the crate root file. pub fn get_proc_address(&self, addr: &str) -> *const () { let addr = CString::from_slice(addr.as_bytes()); - let addr = addr.as_slice_with_nul().as_ptr(); + let addr = addr.as_bytes_with_nul().as_ptr(); unsafe { let p = gl::wgl::GetProcAddress(addr) as *const (); diff --git a/src/win32/monitor.rs b/src/win32/monitor.rs index bcf27e2..fc9f20d 100644 --- a/src/win32/monitor.rs +++ b/src/win32/monitor.rs @@ -1,7 +1,7 @@ use winapi; use user32; -use std::collections::RingBuf; +use std::collections::VecDeque; /// Win32 implementation of the main `MonitorID` object. pub struct MonitorID { @@ -25,11 +25,11 @@ pub struct MonitorID { } /// Win32 implementation of the main `get_available_monitors` function. -pub fn get_available_monitors() -> RingBuf { +pub fn get_available_monitors() -> VecDeque { use std::{iter, mem, ptr}; // return value - let mut result = RingBuf::new(); + let mut result = VecDeque::new(); // enumerating the devices is done by querying device 0, then device 1, then device 2, etc. // until the query function returns null diff --git a/src/x11/headless.rs b/src/x11/headless.rs index 20d86e3..a0f0556 100644 --- a/src/x11/headless.rs +++ b/src/x11/headless.rs @@ -8,7 +8,7 @@ use super::ffi; fn with_c_str(s: &str, f: F) -> T where F: FnOnce(*const libc::c_char) -> T { use std::ffi::CString; let c_str = CString::from_slice(s.as_bytes()); - f(c_str.as_slice_with_nul().as_ptr()) + f(c_str.as_bytes_with_nul().as_ptr()) } pub struct HeadlessContext { diff --git a/src/x11/window/mod.rs b/src/x11/window/mod.rs index faeea3e..0c6da4e 100644 --- a/src/x11/window/mod.rs +++ b/src/x11/window/mod.rs @@ -5,7 +5,7 @@ use libc; use std::{mem, ptr}; use std::cell::Cell; use std::sync::atomic::AtomicBool; -use std::collections::RingBuf; +use std::collections::VecDeque; use super::ffi; use std::sync::{Arc, Mutex, Once, ONCE_INIT, Weak}; use std::sync::{StaticMutex, MUTEX_INIT}; @@ -39,7 +39,7 @@ fn ensure_thread_init() { fn with_c_str(s: &str, f: F) -> T where F: FnOnce(*const libc::c_char) -> T { use std::ffi::CString; let c_str = CString::from_slice(s.as_bytes()); - f(c_str.as_slice_with_nul().as_ptr()) + f(c_str.as_bytes_with_nul().as_ptr()) } struct XWindow { @@ -281,7 +281,7 @@ pub struct Window { wm_delete_window: ffi::Atom, current_size: Cell<(libc::c_int, libc::c_int)>, /// Events that have been retreived with XLib but not dispatched with iterators yet - pending_events: Mutex>, + pending_events: Mutex>, } impl Window { @@ -600,7 +600,7 @@ impl Window { is_closed: AtomicBool::new(false), wm_delete_window: wm_delete_window, current_size: Cell::new((0, 0)), - pending_events: Mutex::new(RingBuf::new()), + pending_events: Mutex::new(VecDeque::new()), }; // returning diff --git a/src/x11/window/monitor.rs b/src/x11/window/monitor.rs index 3c188b6..77ac4ec 100644 --- a/src/x11/window/monitor.rs +++ b/src/x11/window/monitor.rs @@ -1,11 +1,11 @@ use std::ptr; -use std::collections::RingBuf; +use std::collections::VecDeque; use super::super::ffi; use super::ensure_thread_init; pub struct MonitorID(pub u32); -pub fn get_available_monitors() -> RingBuf { +pub fn get_available_monitors() -> VecDeque { ensure_thread_init(); let nb_monitors = unsafe { let display = ffi::XOpenDisplay(ptr::null()); @@ -17,7 +17,7 @@ pub fn get_available_monitors() -> RingBuf { nb_monitors }; - let mut monitors = RingBuf::new(); + let mut monitors = VecDeque::new(); monitors.extend(range(0, nb_monitors).map(|i| MonitorID(i as u32))); monitors } -- cgit v1.2.3