Fix api_transition ControlFlow update compile errors

This commit is contained in:
mitchmindtree 2017-06-09 07:33:22 -07:00
parent 4b42af910b
commit cd71271f0d

View file

@ -32,7 +32,7 @@ macro_rules! gen_api_transition {
callback(::Event::Awakened); callback(::Event::Awakened);
} }
let mut windows = self.windows.lock().unwrap(); let windows = self.windows.lock().unwrap();
for window in windows.iter() { for window in windows.iter() {
for event in window.poll_events() { for event in window.poll_events() {
callback(::Event::WindowEvent { callback(::Event::WindowEvent {
@ -44,7 +44,7 @@ macro_rules! gen_api_transition {
} }
pub fn run_forever<F>(&mut self, mut callback: F) pub fn run_forever<F>(&mut self, mut callback: F)
where F: FnMut(::Event) -> ControlFlow, where F: FnMut(::Event) -> ::ControlFlow,
{ {
self.awakened.store(false, ::std::sync::atomic::Ordering::Relaxed); self.awakened.store(false, ::std::sync::atomic::Ordering::Relaxed);
@ -59,7 +59,7 @@ macro_rules! gen_api_transition {
if let ::ControlFlow::Complete = control_flow { if let ::ControlFlow::Complete = control_flow {
break; break;
} }
::std::thread::sleep_ms(5); ::std::thread::sleep(::std::time::Duration::from_millis(5));
} }
} }
@ -111,7 +111,7 @@ macro_rules! gen_api_transition {
events_loop.windows.lock().unwrap().push(win.clone()); events_loop.windows.lock().unwrap().push(win.clone());
Ok(Window2 { Ok(Window2 {
window: win, window: win,
events_loop: ::std::sync::Arc::downgrade(&events_loop.windows), windows: ::std::sync::Arc::downgrade(&events_loop.windows),
}) })
} }