From 77b37431173a7267835f01915f7bc604d9f5a6ff Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Mon, 28 Sep 2015 12:19:36 -0400 Subject: [PATCH] Warning fixes for OS X. --- examples/fullscreen.rs | 4 ++-- examples/grabbing.rs | 4 ++-- examples/multiwindow.rs | 4 ++-- examples/support/mod.rs | 2 -- examples/transparent.rs | 4 ++-- examples/window.rs | 4 ++-- src/api/cocoa/headless.rs | 4 ++-- src/api/cocoa/mod.rs | 7 +++---- src/headless.rs | 1 - src/lib.rs | 2 ++ 10 files changed, 17 insertions(+), 19 deletions(-) diff --git a/examples/fullscreen.rs b/examples/fullscreen.rs index de4c4491..305829dc 100644 --- a/examples/fullscreen.rs +++ b/examples/fullscreen.rs @@ -40,14 +40,14 @@ fn main() { .build() .unwrap(); - unsafe { window.make_current() }; + let _ = unsafe { window.make_current() }; let context = support::load(&window); for event in window.wait_events() { context.draw_frame((0.0, 1.0, 0.0, 1.0)); - window.swap_buffers(); + let _ = window.swap_buffers(); println!("{:?}", event); diff --git a/examples/grabbing.rs b/examples/grabbing.rs index 05726866..f6cef730 100644 --- a/examples/grabbing.rs +++ b/examples/grabbing.rs @@ -18,7 +18,7 @@ fn main() { println!("This example requires glutin to be compiled with the `wind fn main() { let window = glutin::WindowBuilder::new().build().unwrap(); window.set_title("glutin - Cursor grabbing test"); - unsafe { window.make_current() }; + let _ = unsafe { window.make_current() }; let context = support::load(&window); let mut grabbed = false; @@ -45,7 +45,7 @@ fn main() { } context.draw_frame((0.0, 1.0, 0.0, 1.0)); - window.swap_buffers(); + let _ = window.swap_buffers(); } } diff --git a/examples/multiwindow.rs b/examples/multiwindow.rs index 18299f83..acb2e99e 100644 --- a/examples/multiwindow.rs +++ b/examples/multiwindow.rs @@ -39,13 +39,13 @@ fn main() { #[cfg(feature = "window")] fn run(window: glutin::Window, color: (f32, f32, f32, f32)) { - unsafe { window.make_current() }; + let _ = unsafe { window.make_current() }; let context = support::load(&window); for event in window.wait_events() { context.draw_frame(color); - window.swap_buffers(); + let _ = window.swap_buffers(); match event { glutin::Event::Closed => break, diff --git a/examples/support/mod.rs b/examples/support/mod.rs index ab8e2a17..f05e425f 100644 --- a/examples/support/mod.rs +++ b/examples/support/mod.rs @@ -69,8 +69,6 @@ pub fn load(window: &glutin::Window) -> Context { impl Context { pub fn draw_frame(&self, color: (f32, f32, f32, f32)) { - use std::mem; - unsafe { self.gl.ClearColor(color.0, color.1, color.2, color.3); self.gl.Clear(gl::COLOR_BUFFER_BIT); diff --git a/examples/transparent.rs b/examples/transparent.rs index 7635b3fa..9392d381 100644 --- a/examples/transparent.rs +++ b/examples/transparent.rs @@ -24,7 +24,7 @@ fn main() { .build().unwrap(); window.set_title("A fantastic window!"); window.set_window_resize_callback(Some(resize_callback as fn(u32, u32))); - unsafe { window.make_current() }; + let _ = unsafe { window.make_current() }; println!("Pixel format of the window: {:?}", window.get_pixel_format()); @@ -32,7 +32,7 @@ fn main() { for event in window.wait_events() { context.draw_frame((0.0, 0.0, 0.0, 0.0)); - window.swap_buffers(); + let _ = window.swap_buffers(); println!("{:?}", event); diff --git a/examples/window.rs b/examples/window.rs index 8204b951..8f378f01 100644 --- a/examples/window.rs +++ b/examples/window.rs @@ -22,7 +22,7 @@ fn main() { let mut window = glutin::WindowBuilder::new().build().unwrap(); window.set_title("A fantastic window!"); window.set_window_resize_callback(Some(resize_callback as fn(u32, u32))); - unsafe { window.make_current() }; + let _ = unsafe { window.make_current() }; println!("Pixel format of the window: {:?}", window.get_pixel_format()); @@ -30,7 +30,7 @@ fn main() { for event in window.wait_events() { context.draw_frame((0.0, 1.0, 0.0, 1.0)); - window.swap_buffers(); + let _ = window.swap_buffers(); println!("{:?}", event); diff --git a/src/api/cocoa/headless.rs b/src/api/cocoa/headless.rs index eb1a06f6..49b8bc3c 100644 --- a/src/api/cocoa/headless.rs +++ b/src/api/cocoa/headless.rs @@ -28,8 +28,8 @@ pub struct HeadlessContext { } impl HeadlessContext { - pub fn new((width, height): (u32, u32), pf_reqs: &PixelFormatRequirements, - opengl: &GlAttributes<&HeadlessContext>) -> Result + pub fn new((width, height): (u32, u32), _pf_reqs: &PixelFormatRequirements, + _opengl: &GlAttributes<&HeadlessContext>) -> Result { let context = unsafe { let attributes = [ diff --git a/src/api/cocoa/mod.rs b/src/api/cocoa/mod.rs index ecaca698..5a2f0046 100644 --- a/src/api/cocoa/mod.rs +++ b/src/api/cocoa/mod.rs @@ -6,7 +6,6 @@ use {CreationError, Event, MouseCursor, CursorState}; use CreationError::OsError; use libc; -use Api; use ContextError; use GlAttributes; use GlContext; @@ -21,9 +20,7 @@ use native_monitor::NativeMonitorId; use objc::runtime::{Class, Object, Sel, BOOL, YES, NO}; use objc::declare::ClassDecl; -use cgl; use cgl::{CGLEnable, kCGLCECrashOnRemovedFunctions, CGLSetParameter, kCGLCPSurfaceOpacity}; -use cgl::CGLContextObj as CGL_CGLContextObj; use cocoa::base::{id, nil}; use cocoa::foundation::{NSAutoreleasePool, NSDate, NSDefaultRunLoopMode, NSPoint, NSRect, NSSize, @@ -758,7 +755,7 @@ impl Window { } #[inline] - pub fn set_cursor_position(&self, x: i32, y: i32) -> Result<(), ()> { + pub fn set_cursor_position(&self, _x: i32, _y: i32) -> Result<(), ()> { unimplemented!(); } } @@ -820,6 +817,7 @@ impl IdRef { IdRef(i) } + #[allow(dead_code)] fn retain(i: id) -> IdRef { if i != nil { let _: id = unsafe { msg_send![i, retain] }; @@ -856,6 +854,7 @@ impl Clone for IdRef { } } +#[allow(non_snake_case)] unsafe fn NSEventToEvent(window: &Window, nsevent: id) -> Option { if nsevent == nil { return None; } diff --git a/src/headless.rs b/src/headless.rs index a0c8c2da..23177944 100644 --- a/src/headless.rs +++ b/src/headless.rs @@ -7,7 +7,6 @@ use GlContext; use PixelFormat; use PixelFormatRequirements; use Robustness; -use WindowAttributes; use gl_common; use libc; diff --git a/src/lib.rs b/src/lib.rs index e7232401..8e54560a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -68,6 +68,7 @@ pub use window::{AvailableMonitorsIter, MonitorId, get_available_monitors, get_p pub use native_monitor::NativeMonitorId; use std::io; +#[cfg(not(target_os = "macos"))] use std::cmp::Ordering; mod api; @@ -377,6 +378,7 @@ pub struct PixelFormatRequirements { } impl PixelFormatRequirements { + #[cfg(not(target_os = "macos"))] fn choose_pixel_format(&self, iter: I) -> Result<(T, PixelFormat), CreationError> where I: IntoIterator, T: Clone {