Make {Window, RenderWindow}::new() return Self instead of Option<Self>

The only times window creation can return null is on allocation failure.

At any other time, SFML terminates before we can do anything
with the window.

Author: crumblingstatue

examples/borrowed-resources.rs

@@ -9,8 +9,7 @@ fn main() {
     let mut window = RenderWindow::new(VideoMode::new(800, 600, 32),
                                        "Borrowed resources",
                                        style::CLOSE,
-                                       &Default::default())
-            .unwrap();
+                                       &Default::default());
     window.set_vertical_sync_enabled(true);
 
     // Create a new texture. (Hey Frank!)

examples/custom-drawable.rs

@@ -44,8 +44,7 @@ fn main() {
     let mut window = RenderWindow::new(VideoMode::new(800, 600, 32),
                                        "Custom drawable",
                                        style::CLOSE,
-                                       &Default::default())
-            .unwrap();
+                                       &Default::default());
     window.set_vertical_sync_enabled(true);
 
     let bullet = Bullet::new();

examples/custom-shape.rs

@@ -26,8 +26,7 @@ fn main() {
     let mut window = RenderWindow::new(VideoMode::new(800, 600, 32),
                                        "Custom shape",
                                        style::CLOSE,
-                                       &Default::default())
-            .unwrap();
+                                       &Default::default());
     window.set_vertical_sync_enabled(true);
 
     let mut shape = CustomShape::new(Box::new(TriangleShape));

examples/mouse.rs

@@ -8,8 +8,7 @@ fn main() {
     let mut window = RenderWindow::new(VideoMode::new(800, 600, 32),
                                        "Mouse events",
                                        style::CLOSE,
-                                       &Default::default())
-            .unwrap();
+                                       &Default::default());
     window.set_mouse_cursor_visible(false);
     window.set_framerate_limit(60);
 

examples/pong.rs

@@ -31,8 +31,7 @@ fn main() {
     let mut window = RenderWindow::new(VideoMode::new(game_width, game_height, 32),
                                        "SFML Pong",
                                        style::CLOSE,
-                                       &context_settings)
-            .unwrap();
+                                       &context_settings);
     window.set_vertical_sync_enabled(true);
 
     // Load the sounds used in the game

examples/shader.rs

@@ -238,8 +238,7 @@ fn main() {
     let mut window = RenderWindow::new(VideoMode::new(800, 600, 32),
                                        "SFML Shader",
                                        style::TITLEBAR | style::CLOSE,
-                                       &Default::default())
-            .unwrap();
+                                       &Default::default());
     window.set_vertical_sync_enabled(true);
     let font = Font::from_file("resources/sansation.ttf").unwrap();
     let bg = Texture::from_file("resources/background.jpg").unwrap();

examples/unicode-text-entry.rs

@@ -7,8 +7,7 @@ fn main() {
     let mut window = RenderWindow::new(VideoMode::new(800, 600, 32),
                                        "◢◤ Unicode text entry ◥◣",
                                        style::CLOSE,
-                                       &Default::default())
-            .unwrap();
+                                       &Default::default());
 
     let font = Font::from_file("resources/sansation.ttf").unwrap();
     let mut string = String::from("This text can be edited.\nTry it!");

examples/vertex-arrays.rs

@@ -8,8 +8,7 @@ fn main() {
     let mut window = RenderWindow::new(VideoMode::new(800, 600, 32),
                                        "SFML VertexArray accessors Example",
                                        style::CLOSE,
-                                       &Default::default())
-            .unwrap();
+                                       &Default::default());
     window.set_vertical_sync_enabled(true);
 
     let mut vertex_array = VertexArray::new();

src/graphics/render_window.rs

@@ -45,13 +45,11 @@ impl RenderWindow {
     /// * title - Title of the render window
     /// * style - Window style
     /// * settings - Additional settings for the underlying OpenGL context
-    ///
-    /// Return Some(RenderWindow) or None
     pub fn new(mode: VideoMode,
                title: &str,
                style: Style,
                settings: &ContextSettings)
-               -> Option<RenderWindow> {
+               -> RenderWindow {
         let utf32 = ::unicode_conv::str_to_csfml(title);
         let sf_render_win: *mut ffi::sfRenderWindow =
             unsafe {
@@ -60,11 +58,8 @@ impl RenderWindow {
                                                   style.bits(),
                                                   &settings.raw())
             };
-        if sf_render_win.is_null() {
-            None
-        } else {
-            Some(RenderWindow { render_window: sf_render_win })
-        }
+        assert!(!sf_render_win.is_null(), "Failed to create RenderWindow");
+        RenderWindow { render_window: sf_render_win }
     }
 
     /// Change a render window's icon

src/lib.rs

@@ -16,7 +16,7 @@
 //!
 //! Here is a short example, draw a circle shape and display it.
 //!
-//! ```ignore
+//! ```no_run
 //! extern crate sfml;
 //!
 //! use sfml::system::Vector2f;
@@ -28,8 +28,7 @@
 //!     let mut window = RenderWindow::new(VideoMode::new(800, 600, 32),
 //!                                        "SFML Example",
 //!                                        style::CLOSE,
-//!                                        &ContextSettings::default())
-//!                          .unwrap();
+//!                                        &ContextSettings::default());
 //!
 //!     // Create a CircleShape
 //!     let mut circle = CircleShape::new();
@@ -50,7 +49,7 @@
 //!         // Draw the shape
 //!         window.draw(&circle);
 //!         // Display things on screen
-//!         window.display()
+//!         window.display();
 //!     }
 //! }
 //!

src/window/context.rs

@@ -64,7 +64,7 @@ fn test_settings() {
     use std::thread;
     let video_mode = VideoMode::new(32, 32, 32);
 
-    let window = Window::new(video_mode, "test", Default::default(), &Default::default()).unwrap();
+    let window = Window::new(video_mode, "test", Default::default(), &Default::default());
     let win_settings = window.settings();
     thread::spawn(move || {
                       let context = Context::new();

src/window/event.rs

@@ -20,7 +20,7 @@ use window::joystick::Axis;
 /// # let mut window = Window::new(VideoMode::new(32, 32, 32),
 /// #                              "test",
 /// #                              style::CLOSE,
-/// #                              &Default::default()).unwrap();
+/// #                              &Default::default());
 /// # fn do_something_with_the_new_size(_x: u32, _y: u32) {}
 /// while let Some(event) = window.poll_event() {
 ///     match event {

src/window/video_mode.rs

@@ -40,7 +40,7 @@ use ext::sf_bool_ext::SfBoolExt;
 /// let _window = Window::new(VideoMode::new(1024, 768, desktop.bits_per_pixel),
 ///                           "SFML window",
 ///                           style::CLOSE,
-///                           &Default::default()).unwrap();
+///                           &Default::default());
 /// ```
 #[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Copy)]
 pub struct VideoMode {

src/window/window.rs

@@ -32,7 +32,7 @@ use ext;
 /// let mut window = Window::new(VideoMode::new(800, 600, 32),
 ///                              "SFML window",
 ///                              style::CLOSE,
-///                              &Default::default()).unwrap();
+///                              &Default::default());
 /// // Limit the framerate to 60 frames per second (this step is optional)
 /// window.set_framerate_limit(60);
 ///
@@ -84,25 +84,16 @@ impl Window {
     /// * title - Title of the window
     /// * style - Window style
     /// * settings - Additional settings for the underlying OpenGL context
-    ///
-    /// Return Some(Window) or None
-    pub fn new(mode: VideoMode,
-               title: &str,
-               style: Style,
-               settings: &ContextSettings)
-               -> Option<Window> {
+    pub fn new(mode: VideoMode, title: &str, style: Style, settings: &ContextSettings) -> Window {
         let utf32 = ::unicode_conv::str_to_csfml(title);
         let sf_win: *mut ffi::sfWindow = unsafe {
             ffi::sfWindow_createUnicode(mode.raw(),
                                         utf32.as_ptr() as _,
                                         style.bits(),
                                         &settings.raw())
         };
-        if sf_win.is_null() {
-            None
-        } else {
-            Some(Window { window: sf_win })
-        }
+        assert!(!sf_win.is_null(), "Failed to create Window");
+        Window { window: sf_win }
     }
 
     /// Return an iterator over all the event currently in the events queue.