Merge pull request PistonDevelopers#280 from csherratt/master

Fix unwrap() in examples
johann2 · Jan 25, 2015 · 17eb8ac · 17eb8ac
2 parents 7eb8684 + bc1b352
commit 17eb8ac
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 12 deletions.
diff --git a/examples/clipboard.rs b/examples/clipboard.rs
@@ -18,7 +18,7 @@ extern crate glfw;
 use glfw::{Action, Context, Key};
 
 fn main() {
-    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).unwrap();
+    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).ok().expect("Failed to init glfw");
 
     let (mut window, events) = glfw.create_window(300, 300, "Clipboard Test", glfw::WindowMode::Windowed)
         .expect("Failed to create GLFW window.");

diff --git a/examples/cursor.rs b/examples/cursor.rs
@@ -18,7 +18,7 @@ extern crate glfw;
 use glfw::{Action, Context, CursorMode, Key};
 
 fn main() {
-    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).unwrap();
+    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).ok().expect("Failed to init glfw");
 
     let (mut window, events) = glfw.create_window(800, 600, "Hello, I am a window.", glfw::WindowMode::Windowed)
         .expect("Failed to create GLFW window.");

diff --git a/examples/defaults.rs b/examples/defaults.rs
@@ -18,7 +18,7 @@ extern crate glfw;
 use glfw::Context;
 
 fn main() {
-    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).unwrap();
+    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).ok().expect("Failed to init glfw");
 
     glfw.window_hint(glfw::WindowHint::Visible(true));
 

diff --git a/examples/error.rs b/examples/error.rs
@@ -26,7 +26,7 @@ fn main() {
             f: error_callback as fn(glfw::Error, String, &Cell<usize>),
             data: Cell::new(0),
         }
-    )).unwrap();
+    )).ok().expect("Failed to init glfw");
 
     // Force the error callback to be triggered
     glfw.window_hint(glfw::WindowHint::ContextVersion(40000, 3000)); // Ridiculous!

diff --git a/examples/events.rs b/examples/events.rs
@@ -18,7 +18,7 @@ extern crate glfw;
 use glfw::{Action, Context, Key};
 
 fn main() {
-    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).unwrap();
+    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).ok().expect("Failed to init glfw");
 
     glfw.window_hint(glfw::WindowHint::Resizable(true));
 

diff --git a/examples/modes.rs b/examples/modes.rs
@@ -16,7 +16,7 @@
 extern crate glfw;
 
 fn main() {
-    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).unwrap();
+    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).ok().expect("Failed to init glfw");
 
     glfw.with_primary_monitor(|_, monitor| {
         let _ = monitor.map(|monitor| {

diff --git a/examples/monitors.rs b/examples/monitors.rs
@@ -18,7 +18,7 @@ extern crate glfw;
 use glfw::{Action, Context, Key};
 
 fn main() {
-    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).unwrap();
+    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).ok().expect("Failed to init glfw");
 
     glfw.with_connected_monitors(|_, monitors| {
         for monitor in monitors.iter() {

diff --git a/examples/render_task.rs b/examples/render_task.rs
@@ -23,7 +23,7 @@ use glfw::{Action, Context, Key};
 use std::thread::Builder;
 
 fn main() {
-    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).unwrap();
+    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).ok().expect("Failed to init glfw");
 
     let (mut window, events) = glfw.create_window(300, 300, "Hello this is window", glfw::WindowMode::Windowed)
         .expect("Failed to create GLFW window.");

diff --git a/examples/title.rs b/examples/title.rs
@@ -18,7 +18,7 @@ extern crate glfw;
 use glfw::{Action, Context, Key};
 
 fn main() {
-    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).unwrap();
+    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).ok().expect("Failed to init glfw");
 
     let (mut window, events) = glfw.create_window(400, 400, "English 日本語 русский язык 官話", glfw::WindowMode::Windowed)
         .expect("Failed to create GLFW window.");

diff --git a/examples/window.rs b/examples/window.rs
@@ -18,7 +18,7 @@ extern crate glfw;
 use glfw::{Action, Context, Key};
 
 fn main() {
-    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).unwrap();
+    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).ok().expect("Failed to init glfw");
 
     let (mut window, events) = glfw.create_window(300, 300, "Hello this is window", glfw::WindowMode::Windowed)
         .expect("Failed to create GLFW window.");

diff --git a/src/lib.rs b/src/lib.rs
@@ -32,7 +32,7 @@
 //! use glfw::{Action, Context, Key};
 //!
 //! fn main() {
-//!    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).unwrap();
+//!    let mut glfw = glfw::init(glfw::FAIL_ON_ERRORS).ok().expect("Failed to init glfw");
 //!
 //!     // Create a windowed mode window and its OpenGL context
 //!     let (mut window, events) = glfw.create_window(300, 300, "Hello this is window", glfw::WindowMode::Windowed)
@@ -377,7 +377,7 @@ pub enum InitError {
 /// extern crate glfw;
 ///
 /// fn main() {
-///    let glfw = glfw::init(glfw::FAIL_ON_ERRORS).unwrap();
+///    let glfw = glfw::init(glfw::FAIL_ON_ERRORS).ok().expect("Failed to init glfw");
 /// }
 /// ~~~
 ///