aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2015-01-29 01:17:09 +0100
committertomaka <pierre.krieger1708@gmail.com>2015-01-29 01:17:09 +0100
commit5611a3251391755dc943b17d9b3610710ecf2e3a (patch)
treea9002a2ce95e239dc80dc53a1795b7a6da7e4b9c /src
parent1a9cf9bc5c6e9251c8035e8412edafe4bfa8869d (diff)
parent6a27fa9d266b5e261a2b9f9e071680f06fb6d904 (diff)
downloadglutin-5611a3251391755dc943b17d9b3610710ecf2e3a.tar.gz
glutin-5611a3251391755dc943b17d9b3610710ecf2e3a.zip
Merge pull request #238 from andrewrk/master
fix for rust nightly
Diffstat (limited to 'src')
-rw-r--r--src/android/mod.rs2
-rw-r--r--src/lib.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/android/mod.rs b/src/android/mod.rs
index 7c4f186..f406e2b 100644
--- a/src/android/mod.rs
+++ b/src/android/mod.rs
@@ -251,7 +251,7 @@ impl Window {
pub fn wait_events(&self) -> RingBuf<Event> {
use std::time::Duration;
- use std::io::timer;
+ use std::old_io::timer;
timer::sleep(Duration::milliseconds(16));
self.poll_events()
}
diff --git a/src/lib.rs b/src/lib.rs
index 1cf9b48..eefd8e0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -425,7 +425,7 @@ impl HeadlessRendererBuilder {
/// // draw everything here
///
/// window.swap_buffers();
-/// std::io::timer::sleep(17);
+/// std::old_io::timer::sleep(17);
/// }
/// ```
#[cfg(feature = "window")]