aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormitchmindtree <mitchell.nordine@gmail.com>2015-02-21 23:59:37 +1100
committermitchmindtree <mitchell.nordine@gmail.com>2015-02-21 23:59:37 +1100
commit9bb41bf2773a353804ab710bb65c0e21a4c22a20 (patch)
tree9950aa3b8c60c3803df653ae7525e1d2b615bdc2
parent7ff76cddd981d64fbf0f821ba8a5f456fd0fcb29 (diff)
downloadglutin-9bb41bf2773a353804ab710bb65c0e21a4c22a20.tar.gz
glutin-9bb41bf2773a353804ab710bb65c0e21a4c22a20.zip
Fixed errors on latest nightly, RingBuf -> VecDeque
-rw-r--r--src/cocoa/mod.rs12
-rw-r--r--src/cocoa/monitor.rs8
-rw-r--r--src/window.rs4
3 files changed, 12 insertions, 12 deletions
diff --git a/src/cocoa/mod.rs b/src/cocoa/mod.rs
index 5d7bcd9..12f7a06 100644
--- a/src/cocoa/mod.rs
+++ b/src/cocoa/mod.rs
@@ -24,7 +24,7 @@ use std::cell::Cell;
use std::ffi::{CString, c_str_to_bytes};
use std::mem;
use std::ptr;
-use std::collections::RingBuf;
+use std::collections::VecDeque;
use std::str::FromStr;
use std::str::from_utf8;
use std::sync::Mutex;
@@ -48,7 +48,7 @@ static mut ctrl_pressed: bool = false;
static mut win_pressed: bool = false;
static mut alt_pressed: bool = false;
-struct DelegateState<'a> {
+struct DelegateState {
is_closed: bool,
context: id,
view: id,
@@ -169,7 +169,7 @@ pub struct Window {
is_closed: Cell<bool>,
/// Events that have been retreived with XLib but not dispatched with iterators yet
- pending_events: Mutex<RingBuf<Event>>,
+ pending_events: Mutex<VecDeque<Event>>,
}
#[cfg(feature = "window")]
@@ -252,7 +252,7 @@ impl<'a> Iterator for PollEventsIterator<'a> {
(scale_factor * (view_rect.size.height - view_point.y) as f32) as i32)))
},
NSKeyDown => {
- let mut events = RingBuf::new();
+ let mut events = VecDeque::new();
let received_c_str = event.characters().UTF8String();
let received_str = CString::from_slice(c_str_to_bytes(&received_c_str));
for received_char in from_utf8(received_str.as_bytes()).unwrap().chars() {
@@ -272,7 +272,7 @@ impl<'a> Iterator for PollEventsIterator<'a> {
Some(KeyboardInput(Released, NSEvent::keyCode(event) as u8, vkey))
},
NSFlagsChanged => {
- let mut events = RingBuf::new();
+ let mut events = VecDeque::new();
let shift_modifier = Window::modifier_event(event, appkit::NSShiftKeyMask, events::VirtualKeyCode::LShift, shift_pressed);
if shift_modifier.is_some() {
shift_pressed = !shift_pressed;
@@ -380,7 +380,7 @@ impl Window {
resize: None,
is_closed: Cell::new(false),
- pending_events: Mutex::new(RingBuf::new()),
+ pending_events: Mutex::new(VecDeque::new()),
};
Ok(window)
diff --git a/src/cocoa/monitor.rs b/src/cocoa/monitor.rs
index 912c02d..47adc03 100644
--- a/src/cocoa/monitor.rs
+++ b/src/cocoa/monitor.rs
@@ -1,10 +1,10 @@
use core_graphics::display;
-use std::collections::RingBuf;
+use std::collections::VecDeque;
pub struct MonitorID(u32);
-pub fn get_available_monitors() -> RingBuf<MonitorID> {
- let mut monitors = RingBuf::new();
+pub fn get_available_monitors() -> VecDeque<MonitorID> {
+ let mut monitors = VecDeque::new();
unsafe {
let max_displays = 10u32;
let mut active_displays = [0u32; 10];
@@ -12,7 +12,7 @@ pub fn get_available_monitors() -> RingBuf<MonitorID> {
display::CGGetActiveDisplayList(max_displays,
&mut active_displays[0],
&mut display_count);
- for i in range(0us, display_count as usize) {
+ for i in range(0, display_count as usize) {
monitors.push_back(MonitorID(active_displays[i]));
}
}
diff --git a/src/window.rs b/src/window.rs
index 56f3410..f82fa4f 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -1,4 +1,4 @@
-use std::collections::ring_buf::IntoIter as RingBufIter;
+use std::collections::vec_deque::IntoIter as VecDequeIter;
use std::default::Default;
use Api;
@@ -452,7 +452,7 @@ impl<'a> Iterator for WaitEventsIterator<'a> {
// Implementation note: we retreive the list once, then serve each element by one by one.
// This may change in the future.
pub struct AvailableMonitorsIter {
- data: RingBufIter<winimpl::MonitorID>,
+ data: VecDequeIter<winimpl::MonitorID>,
}
impl Iterator for AvailableMonitorsIter {