Fixing up compiler warnings.

src/conf.rs

@@ -12,10 +12,8 @@
 
 use std::io;
 use toml;
-use winit;
 
 use GameResult;
-use GameError;
 
 /// Possible fullscreen modes.
 #[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq)]

src/context.rs

@@ -1,13 +1,11 @@
 use winit;
 
 use std::fmt;
-use std::io::Read;
 
-use GameError;
 use GameResult;
 use audio;
 use conf;
-use event::{self, winit_event};
+use event::winit_event;
 use filesystem::Filesystem;
 use graphics::{self, Point2};
 use keyboard;
@@ -171,7 +169,7 @@ impl Context {
                 }
             }
             winit_event::Event::DeviceEvent { event: winit_event::DeviceEvent::MouseMotion { delta: (x, y) }, .. } => {
-                self.mouse_context.set_last_position(
+                self.mouse_context.set_last_delta(
                     Point2::new(*x as f32, *y as f32),
                 );
             }

src/error.rs

@@ -232,3 +232,9 @@ impl From<glutin::CreationError> for GameError {
         GameError::WindowError(s)
     }
 }
+
+impl From<glutin::ContextError> for GameError {
+    fn from(s: glutin::ContextError) -> GameError {
+        GameError::RenderError(format!("OpenGL context error: {}", s))
+    }
+}

src/graphics/context.rs

@@ -35,6 +35,7 @@ where
     pub(crate) color_format: gfx::format::Format,
     pub(crate) depth_format: gfx::format::Format,
 
+    // TODO: is this needed?
     pub(crate) backend_spec: B,
     pub(crate) window: glutin::GlWindow,
     pub(crate) multisample_samples: u8,
@@ -259,8 +260,8 @@ impl GraphicsContext {
             modelview_stack: vec![initial_transform],
             white_image,
             screen_rect: Rect::new(left, top, right - left, bottom - top),
-            color_format: color_format,
-            depth_format: depth_format,
+            color_format,
+            depth_format,
 
             backend_spec: backend,
             window,

src/graphics/mod.rs

@@ -287,16 +287,17 @@ pub fn draw_ex(ctx: &mut Context, drawable: &Drawable, params: DrawParam) -> Gam
 /// Call this at the end of your `EventHandler`'s `draw()` method.
 ///
 /// Unsets any active canvas.
-pub fn present(ctx: &mut Context) {
+pub fn present(ctx: &mut Context) -> GameResult<()> {
     let gfx = &mut ctx.gfx_context;
     gfx.data.out = gfx.screen_render_target.clone();
     // We might want to give the user more control over when the
     // encoder gets flushed eventually, if we want them to be able
     // to do their own gfx drawing.  HOWEVER, the whole pipeline type
     // thing is a bigger hurdle, so this is fine for now.
     gfx.encoder.flush(&mut *gfx.device);
-    gfx.window.swap_buffers();
+    gfx.window.swap_buffers()?;
     gfx.device.cleanup();
+    Ok(())
 }
 
 /// Take a screenshot by outputting the current render surface
@@ -361,7 +362,7 @@ pub fn screenshot(ctx: &mut Context) -> GameResult<Image> {
         blend_mode: None,
         width: u32::from(w),
         height: u32::from(h),
-        debug_id: debug_id,
+        debug_id,
     };
 
     Ok(image)

src/keyboard.rs

@@ -1,9 +1,7 @@
 //! Keyboard utility functions.
 
 use context::Context;
-use error::GameResult;
 use event::Keycode;
-use graphics;
 
 /// Tracks last key pressed, to distinguish if the system
 /// is sending repeat events when a key is held down.

src/mouse.rs

@@ -3,6 +3,7 @@
 use context::Context;
 use graphics;
 use graphics::Point2;
+use GameResult;
 pub use winit::{CursorState, MouseCursor};
 
 /// Stores state information for the mouse,
@@ -57,9 +58,9 @@ pub fn get_cursor_state(ctx: &Context) -> CursorState {
 }
 
 /// Set whether or not the mouse is grabbed (confined to the window) or hidden (invisible).
-pub fn set_cursor_state(ctx: &mut Context, state: CursorState) {
+pub fn set_cursor_state(ctx: &mut Context, state: CursorState) -> GameResult<()> {
     ctx.mouse_context.cursor_state = state;
-    graphics::get_window(ctx).set_cursor_state(state);
+    graphics::get_window(ctx).set_cursor_state(state).map_err(|e| e.into())
 }
 
 /// Get the current position of the mouse cursor, in pixels.
@@ -76,7 +77,10 @@ pub fn get_delta(ctx: &Context) -> Point2 {
 
 /// Set the current position of the mouse cursor, in pixels.
 /// Uses strictly window-only coordinates.
-pub fn set_position(ctx: &mut Context, point: Point2) {
+pub fn set_position(ctx: &mut Context, point: Point2) -> GameResult<()> {
     ctx.mouse_context.last_position = point;
-    graphics::get_window(ctx).set_cursor_position(point.x as i32, point.y as i32);
+    if graphics::get_window(ctx).set_cursor_position(point.x as i32, point.y as i32).is_err() {
+        return Err("Couldn't set mouse cursor position!".to_owned().into());
+    }
+    Ok(())
 }