Merge branch 'master' of github.com:AngryLawyer/rust-sdl2

Conflicts:
	sdl2-sys/src/audio.rs
	sdl2-sys/src/controller.rs
	sdl2-sys/src/event.rs
	sdl2-sys/src/haptic.rs
	sdl2-sys/src/joystick.rs

README.md

@@ -40,7 +40,7 @@ If you're using [cargo](http://crates.io/) to manage your project, you can downl
 
 ```toml
     [dependencies]
-    sdl2 = "0.0.27"
+    sdl2 = "0.0.28"
 ```
 
 Alternatively, pull it from GitHub

sdl2-sys/src/audio.rs

@@ -57,7 +57,7 @@ pub struct SDL_AudioCVT {
     pub len_cvt: c_int,
     pub len_mult: c_int,
     pub len_ratio: c_double,
-    filters: [SDL_AudioFilter; 10],
+    filters: [SDL_AudioFilter; 10usize],
     filter_index: c_int,
 }
 pub type SDL_AudioDeviceID = uint32_t;

sdl2-sys/src/controller.rs

@@ -23,7 +23,7 @@ pub struct SDL_GameControllerButtonBind {
 #[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_GameControllerButtonBindData {
-    data: [c_uchar; 8],
+    data: [c_uchar; 8usize],
 }
 
 #[allow(dead_code)]

sdl2-sys/src/event.rs

@@ -100,7 +100,7 @@ pub struct SDL_TextEditingEvent {
     pub _type: uint32_t,
     pub timestamp: uint32_t,
     pub windowID: uint32_t,
-    pub text: [c_char; 32],
+    pub text: [c_char; 32usize],
     pub start: int32_t,
     pub length: int32_t,
 }
@@ -111,7 +111,7 @@ pub struct SDL_TextInputEvent {
     pub _type: uint32_t,
     pub timestamp: uint32_t,
     pub windowID: uint32_t,
-    pub text: [c_char; 32],
+    pub text: [c_char; 32usize],
 }
 
 #[derive(Copy, Clone)]
@@ -333,7 +333,7 @@ pub struct SDL_SysWMEvent {
 #[allow(missing_copy_implementations)]
 #[repr(C)]
 pub struct SDL_Event {
-    pub data: [uint8_t; 56],
+    pub data: [uint8_t; 56usize],
 }
 
 impl SDL_Event {

sdl2-sys/src/haptic.rs

@@ -126,7 +126,7 @@ pub struct SDL_HapticCustom {
 #[allow(missing_copy_implementations)]
 #[repr(C)]
 pub struct SDL_HapticEffect {
-    pub data: [uint8_t; 72],
+    pub data: [uint8_t; 72usize],
 }
 
 impl SDL_HapticEffect {
@@ -191,4 +191,3 @@ extern "C" {
     pub fn SDL_HapticRumblePlay(haptic: *const SDL_Haptic, strength: c_float, length: uint32_t) -> c_int;
     pub fn SDL_HapticRumbleStop(haptic: *const SDL_Haptic) -> c_int;
 }
-

sdl2-sys/src/joystick.rs

@@ -8,7 +8,7 @@ pub type SDL_Joystick = c_void;
 #[derive(Copy, Clone)]
 #[repr(C)]
 pub struct SDL_JoystickGUID {
-    pub data: [uint8_t; 16],
+    pub data: [uint8_t; 16usize],
 }
 
 extern "C" {