Update to latest Rust

src/sdl2/event.rs

@@ -622,7 +622,7 @@ pub enum Event {
 
 impl ::std::fmt::Show for Event {
     fn fmt(&self, out: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
-        out.buf.write_str(match *self {
+        out.write(match *self {
             NoEvent => "NoEvent",
             QuitEvent(..) => "QuitEvent",
             AppTerminatingEvent(..) => "AppTerminatingEvent",
@@ -662,7 +662,7 @@ impl ::std::fmt::Show for Event {
             ClipboardUpdateEvent(..) => "ClipboardUpdateEvent",
             DropFileEvent(..) => "DropFileEvent",
             UserEvent(..) => "UserEvent",
-        })
+        }.as_bytes())
     }
 }
 
@@ -760,7 +760,7 @@ impl Event {
                 KeyDownEvent(event.timestamp as uint, window,
                              FromPrimitive::from_int(event.keysym.sym as int).unwrap(),
                              FromPrimitive::from_int(event.keysym.scancode as int).unwrap(),
-                             keyboard::Mod::from_bits(event.keysym._mod as SDL_Keymod))
+                             keyboard::Mod::from_bits(event.keysym._mod as SDL_Keymod).unwrap())
             }
             KeyUpEventType => {
                 let event = *raw.key();
@@ -774,7 +774,7 @@ impl Event {
                 KeyUpEvent(event.timestamp as uint, window,
                            FromPrimitive::from_int(event.keysym.sym as int).unwrap(),
                            FromPrimitive::from_int(event.keysym.scancode as int).unwrap(),
-                           keyboard::Mod::from_bits(event.keysym._mod as SDL_Keymod))
+                           keyboard::Mod::from_bits(event.keysym._mod as SDL_Keymod).unwrap())
             }
             TextEditingEventType => {
                 let event = *raw.edit();
@@ -813,7 +813,7 @@ impl Event {
 
                 MouseMotionEvent(event.timestamp as uint, window,
                                  event.which as uint,
-                                 mouse::MouseState::from_bits(event.state),
+                                 mouse::MouseState::from_bits(event.state).unwrap(),
                                  event.x as int, event.y as int,
                                  event.xrel as int, event.yrel as int)
             }
@@ -874,7 +874,7 @@ impl Event {
                 let event = *raw.jhat();
                 JoyHatMotionEvent(event.timestamp as uint, event.which as int,
                                   event.hat as int,
-                                  joystick::HatState::from_bits(event.value))
+                                  joystick::HatState::from_bits(event.value).unwrap())
             }
             JoyButtonDownEventType => {
                 let event = *raw.jbutton();

src/sdl2/keyboard.rs

@@ -93,7 +93,7 @@ pub fn get_keyboard_state() -> HashMap<ScanCode, bool> {
 }
 
 pub fn get_mod_state() -> Mod {
-    unsafe { Mod::from_bits(ll::SDL_GetModState()) }
+    unsafe { Mod::from_bits(ll::SDL_GetModState()).unwrap() }
 }
 
 pub fn set_mod_state(flags: Mod) {

src/sdl2/mouse.rs

@@ -175,7 +175,7 @@ pub fn get_mouse_state() -> (MouseState, int, int) {
     let y = 0;
     unsafe {
         let raw = ll::SDL_GetMouseState(&x, &y);
-        return (MouseState::from_bits(raw), x as int, y as int);
+        return (MouseState::from_bits(raw).unwrap(), x as int, y as int);
     }
 }
 
@@ -184,7 +184,7 @@ pub fn get_relative_mouse_state() -> (MouseState, int, int) {
     let y = 0;
     unsafe {
         let raw = ll::SDL_GetRelativeMouseState(&x, &y);
-        return (MouseState::from_bits(raw), x as int, y as int);
+        return (MouseState::from_bits(raw).unwrap(), x as int, y as int);
     }
 }
 

src/sdl2/render.rs

@@ -180,7 +180,7 @@ pub enum RendererFlip {
 
 impl RendererInfo {
     pub fn from_ll(info: &ll::SDL_RendererInfo) -> RendererInfo {
-        let actual_flags = unsafe { RendererFlags::from_bits(info.flags) };
+        let actual_flags = RendererFlags::from_bits(info.flags).unwrap();
 
         unsafe {
             let texture_formats: Vec<pixels::PixelFormatFlag> = info.texture_formats.slice(0, info.num_texture_formats as uint).iter().map(|&format| {

src/sdl2/sdl.rs

@@ -107,7 +107,7 @@ pub fn quit() {
 pub fn was_inited(flags: InitFlag) -> InitFlag {
     unsafe {
         let raw = ll::SDL_WasInit(flags.bits());
-        flags & InitFlag::from_bits(raw)
+        flags & InitFlag::from_bits(raw).unwrap()
     }
 }
 

src/sdl2/version.rs

@@ -38,7 +38,7 @@ impl Version {
 
 impl fmt::Show for Version {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f.buf, "{}.{}.{}", self.major, self.minor, self.patch)
+        write!(f, "{}.{}.{}", self.major, self.minor, self.patch)
     }
 }
 

src/sdl2/video.rs

@@ -408,7 +408,7 @@ impl Window {
     pub fn get_flags(&self) -> WindowFlags {
         unsafe {
             let raw = ll::SDL_GetWindowFlags(self.raw);
-            WindowFlags::from_bits(raw)
+            WindowFlags::from_bits(raw).unwrap()
         }
     }