Fixes for 1.0 alpha

Author: Jameson Ernst

examples/audio-whitenoise.rs

@@ -30,11 +30,11 @@ fn main() {
     // false: Playback
     let mut device = match desired_spec.open_audio_device(None, false) {
         Ok(device) => device,
-        Err(s) => panic!("{}", s)
+        Err(s) => panic!("{:?}", s)
     };
 
     // Show obtained AudioSpec
-    println!("{}", device.get_spec());
+    println!("{:?}", device.get_spec());
 
     // Start playback
     device.resume();

src/sdl2/audio.rs

@@ -237,9 +237,9 @@ impl<T: AudioFormatNum<T>, CB: AudioCallback<T>> AudioSpecDesired<T, CB> {
     }
 
     fn callback_to_userdata(callback: CB) -> Box<AudioCallbackUserdata<CB>> {
-        box AudioCallbackUserdata {
+        Box::new(AudioCallbackUserdata {
             callback: callback
-        }
+        })
     }
 
     /// Opens a new audio device given the desired parameters and callback.

src/sdl2/keycode.rs

@@ -241,7 +241,7 @@ pub enum KeyCode {
     Sleep              = 1073742106,
 }
 
-impl<S: hash::Writer> Hash<S> for KeyCode {
+impl<S: hash::Hasher + hash::Writer> Hash<S> for KeyCode {
     #[inline]
     fn hash(&self, state: &mut S) {
         (*self as i32).hash(state);

src/sdl2/macros.rs

@@ -1,5 +1,5 @@
 macro_rules! impl_raw_accessors(
-    ($($t:ty, $raw:ty);+) => (
+    ($(($t:ty, $raw:ty)),+) => (
         $(
         impl $t {
             #[inline]
@@ -10,7 +10,7 @@ macro_rules! impl_raw_accessors(
 );
 
 macro_rules! impl_owned_accessors(
-    ($($t:ty, $owned:ident);+) => (
+    ($(($t:ty, $owned:ident)),+) => (
         $(
         impl $t {
             #[inline]
@@ -21,7 +21,7 @@ macro_rules! impl_owned_accessors(
 );
 
 macro_rules! impl_raw_constructor(
-    ($($t:ty -> $te:ident ($($r:ident:$rt:ty),+));+) => (
+    ($(($t:ty, $te:ident ($($r:ident:$rt:ty),+))),+) => (
         $(
         impl $t {
             #[inline]

src/sdl2/pixels.rs

@@ -7,7 +7,7 @@ pub struct Palette {
     raw: *const ll::SDL_Palette
 }
 
-impl_raw_accessors!(Palette, *const ll::SDL_Palette);
+impl_raw_accessors!((Palette, *const ll::SDL_Palette));
 
 #[derive(PartialEq, Clone, Copy)]
 pub enum Color {
@@ -59,8 +59,8 @@ pub struct PixelFormat {
     raw: *const ll::SDL_PixelFormat
 }
 
-impl_raw_accessors!(PixelFormat, *const ll::SDL_PixelFormat);
-impl_raw_constructor!(PixelFormat -> PixelFormat (raw: *const ll::SDL_PixelFormat));
+impl_raw_accessors!((PixelFormat, *const ll::SDL_PixelFormat));
+impl_raw_constructor!((PixelFormat, PixelFormat (raw: *const ll::SDL_PixelFormat)));
 
 #[derive(Copy, Clone, PartialEq, Show, FromPrimitive)]
 pub enum PixelFormatFlag {
@@ -136,7 +136,7 @@ impl PixelFormatFlag {
             PixelFormatFlag::Unknown | PixelFormatFlag::Index1LSB |
             PixelFormatFlag::Index1MSB | PixelFormatFlag::Index4LSB |
             PixelFormatFlag::Index4MSB
-                => panic!("not supported format: {}", *self),
+                => panic!("not supported format: {:?}", *self),
         }
     }
 
@@ -172,7 +172,7 @@ impl PixelFormatFlag {
             PixelFormatFlag::Unknown | PixelFormatFlag::Index1LSB |
             PixelFormatFlag::Index1MSB | PixelFormatFlag::Index4LSB |
             PixelFormatFlag::Index4MSB
-                => panic!("not supported format: {}", *self),
+                => panic!("not supported format: {:?}", *self),
         }
     }
 }

src/sdl2/rwops.rs

@@ -13,8 +13,8 @@ pub struct RWops {
     close_on_drop: bool
 }
 
-impl_raw_accessors!(RWops, *const ll::SDL_RWops);
-impl_owned_accessors!(RWops, close_on_drop);
+impl_raw_accessors!((RWops, *const ll::SDL_RWops));
+impl_owned_accessors!((RWops, close_on_drop));
 
 /// A structure that provides an abstract interface to stream I/O.
 impl RWops {

src/sdl2/scancode.rs

@@ -247,7 +247,7 @@ pub enum ScanCode {
     Num                = 512,
 }
 
-impl<S: hash::Writer> Hash<S> for ScanCode {
+impl<S: hash::Hasher + hash::Writer> Hash<S> for ScanCode {
     #[inline]
     fn hash(&self, state: &mut S) {
         (*self as i32).hash(state);

src/sdl2/surface.rs

@@ -37,9 +37,9 @@ impl Drop for Surface {
     }
 }
 
-impl_raw_accessors!(Surface, *const ll::SDL_Surface);
-impl_owned_accessors!(Surface, owned);
-impl_raw_constructor!(Surface -> Surface (raw: *const ll::SDL_Surface, owned: bool));
+impl_raw_accessors!((Surface, *const ll::SDL_Surface));
+impl_owned_accessors!((Surface, owned));
+impl_raw_constructor!((Surface, Surface (raw: *const ll::SDL_Surface, owned: bool)));
 
 impl Surface {
     pub fn new(surface_flags: SurfaceFlag, width: int, height: int, bpp: int,

src/sdl2/video.rs

@@ -164,17 +164,17 @@ pub struct Window {
 }
 
 impl_raw_accessors!(
-    GLContext, ll::SDL_GLContext;
-    Window, *const ll::SDL_Window
+    (GLContext, ll::SDL_GLContext),
+    (Window, *const ll::SDL_Window)
 );
 
 impl_owned_accessors!(
-    GLContext, owned;
-    Window, owned
+    (GLContext, owned),
+    (Window, owned)
 );
 
 impl_raw_constructor!(
-    Window -> Window (raw: *const ll::SDL_Window, owned: bool)
+    (Window, Window (raw: *const ll::SDL_Window, owned: bool))
 );
 
 impl Drop for Window {