aboutsummaryrefslogtreecommitdiffstats
path: root/src/osx/mod.rs
diff options
context:
space:
mode:
authorJames Gilles <jameshgilles@gmail.com>2015-01-17 21:01:13 -0500
committerJames Gilles <jameshgilles@gmail.com>2015-01-17 21:13:57 -0500
commit75c14c52138173b6fe8f69c284c935a0d90dde6d (patch)
tree37e284b24edb389de13ad3d4657e93f3915fb9ab /src/osx/mod.rs
parent211a3260363df63f07e0224c4677b1b43b1d0022 (diff)
downloadglutin-75c14c52138173b6fe8f69c284c935a0d90dde6d.tar.gz
glutin-75c14c52138173b6fe8f69c284c935a0d90dde6d.zip
Remove AsciiExt import, s/uint/u32/, delete some files I accidentally
committed (whoops)
Diffstat (limited to 'src/osx/mod.rs')
-rw-r--r--src/osx/mod.rs11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/osx/mod.rs b/src/osx/mod.rs
index 4b111bf..86a891c 100644
--- a/src/osx/mod.rs
+++ b/src/osx/mod.rs
@@ -4,7 +4,6 @@ pub use self::headless::HeadlessContext;
use {CreationError, Event, MouseCursor};
use CreationError::OsError;
use libc;
-use std::ascii::AsciiExt;
use BuilderAttribs;
@@ -139,7 +138,7 @@ extern fn window_did_resize(this: id, _: id) -> id {
impl Window {
fn new_impl(dimensions: Option<(u32, u32)>, title: &str, monitor: Option<MonitorID>,
- vsync: bool, visible: bool, gl_version: Option<(uint, uint)>) -> Result<Window, CreationError> {
+ vsync: bool, visible: bool, gl_version: Option<(u32, u32)>) -> Result<Window, CreationError> {
let app = match Window::create_app() {
Some(app) => app,
None => { return Err(OsError(format!("Couldn't create NSApplication"))); },
@@ -269,11 +268,11 @@ impl Window {
}
}
- fn create_context(view: id, vsync: bool, gl_version: Option<(uint, uint)>) -> Option<id> {
+ fn create_context(view: id, vsync: bool, gl_version: Option<(u32, u32)>) -> Option<id> {
let profile = match gl_version {
- None | Some((0...2, _)) | Some((3, 0)) => NSOpenGLProfileVersionLegacy as uint,
- Some((3, 1...2)) => NSOpenGLProfileVersion3_2Core as uint,
- Some((_, _)) => NSOpenGLProfileVersion4_1Core as uint,
+ None | Some((0...2, _)) | Some((3, 0)) => NSOpenGLProfileVersionLegacy as u32,
+ Some((3, 1...2)) => NSOpenGLProfileVersion3_2Core as u32,
+ Some((_, _)) => NSOpenGLProfileVersion4_1Core as u32,
};
unsafe {
let attributes = [