Merge pull request #238 from andrewrk/master

fix for rust nightly
This commit is contained in:
tomaka 2015-01-29 01:17:09 +01:00
commit 5611a32513
4 changed files with 4 additions and 4 deletions

View file

@ -3,7 +3,7 @@ extern crate gl_generator;
extern crate khronos_api; extern crate khronos_api;
use std::os; use std::os;
use std::io::File; use std::old_io::File;
fn main() { fn main() {
let target = os::getenv("TARGET").unwrap(); let target = os::getenv("TARGET").unwrap();

View file

@ -4,7 +4,7 @@ extern crate android_glue;
extern crate glutin; extern crate glutin;
use std::io::stdio::stdin; use std::old_io::stdio::stdin;
mod support; mod support;

View file

@ -251,7 +251,7 @@ impl Window {
pub fn wait_events(&self) -> RingBuf<Event> { pub fn wait_events(&self) -> RingBuf<Event> {
use std::time::Duration; use std::time::Duration;
use std::io::timer; use std::old_io::timer;
timer::sleep(Duration::milliseconds(16)); timer::sleep(Duration::milliseconds(16));
self.poll_events() self.poll_events()
} }

View file

@ -425,7 +425,7 @@ impl HeadlessRendererBuilder {
/// // draw everything here /// // draw everything here
/// ///
/// window.swap_buffers(); /// window.swap_buffers();
/// std::io::timer::sleep(17); /// std::old_io::timer::sleep(17);
/// } /// }
/// ``` /// ```
#[cfg(feature = "window")] #[cfg(feature = "window")]