Merge pull request #116 from dpx-infinity/master

Switch to SdlResult

Author: AngryLawyer

src/sdl2/audio.rs

@@ -9,6 +9,7 @@ use std::raw::Slice;
 
 use get_error;
 use rwops::RWops;
+use SdlResult;
 
 
 #[allow(non_camel_case_types)]
@@ -221,11 +222,11 @@ extern "C" fn c_audio_callback(userdata: *c_void, stream: *uint8_t, len: c_int)
 
 
 impl<'a> AudioSpec<'a> {
-    pub fn load_wav(path: &Path) -> Result<(AudioSpec, CVec<u8>), String> {
+    pub fn load_wav(path: &Path) -> SdlResult<(AudioSpec, CVec<u8>)> {
         AudioSpec::load_wav_rw(&try!(RWops::from_file(path, "rb")))
     }
 
-    pub fn load_wav_rw(src: &RWops) -> Result<(AudioSpec, CVec<u8>), String> {
+    pub fn load_wav_rw(src: &RWops) -> SdlResult<(AudioSpec, CVec<u8>)> {
         assert_eq!(mem::size_of::<AudioSpec>(), mem::size_of::<ll::SDL_AudioSpec>());
         let mut spec = unsafe { mem::uninitialized::<AudioSpec>() };
         let audio_buf = ptr::null::<u8>();
@@ -261,7 +262,7 @@ impl AudioDevice {
         }
     }
 
-    pub fn open(device: Option<&str>, iscapture: int, spec: &AudioSpec) -> Result<(AudioDevice, AudioSpec), String> {
+    pub fn open(device: Option<&str>, iscapture: int, spec: &AudioSpec) -> SdlResult<(AudioDevice, AudioSpec)> {
         //! SDL_OpenAudioDevice
         let obtained = unsafe { mem::uninitialized::<AudioSpec>() };
         unsafe {
@@ -334,7 +335,7 @@ impl Drop for AudioCVT {
 
 impl AudioCVT {
     pub fn new(src_format: AudioFormat, src_channels: u8, src_rate: int,
-               dst_format: AudioFormat, dst_channels: u8, dst_rate: int) -> Result<AudioCVT, String> {
+               dst_format: AudioFormat, dst_channels: u8, dst_rate: int) -> SdlResult<AudioCVT> {
         unsafe {
             let c_cvt_p = libc::malloc(mem::size_of::<ll::SDL_AudioCVT>() as size_t) as *mut ll::SDL_AudioCVT;
             let ret = ll::SDL_BuildAudioCVT(c_cvt_p,
@@ -348,12 +349,12 @@ impl AudioCVT {
         }
     }
 
-    pub fn convert(&self, src: CVec<u8>) -> Result<CVec<u8>, String> {
+    pub fn convert(&self, src: CVec<u8>) -> SdlResult<CVec<u8>> {
         //! Convert audio data to a desired audio format.
 
         unsafe {
             if (*self.raw).needed != 1 {
-                return Err("no convertion needed!".to_owned())
+                return Err("no convertion needed!".into_owned())
             }
             // set len
             (*self.raw).len = src.len() as c_int;

src/sdl2/event.rs

@@ -21,6 +21,7 @@ use mouse::{Mouse, MouseState};
 use scancode::ScanCode;
 use video;
 use get_error;
+use SdlResult;
 
 #[doc(hidden)]
 #[allow(non_camel_case_types)]
@@ -1062,7 +1063,7 @@ pub fn poll_event() -> Event {
 }
 
 /// Wait indefinitely for the next available event.
-pub fn wait_event() -> Result<Event, String> {
+pub fn wait_event() -> SdlResult<Event> {
     let raw = null_event();
     let success = unsafe { ll::SDL_WaitEvent(&raw) == 1 as c_int };
 
@@ -1071,7 +1072,7 @@ pub fn wait_event() -> Result<Event, String> {
 }
 
 /// Wait until the specified timeout (in milliseconds) for the next available event.
-pub fn wait_event_timeout(timeout: int) -> Result<Event, String> {
+pub fn wait_event_timeout(timeout: int) -> SdlResult<Event> {
     let raw = null_event();
     let success = unsafe { ll::SDL_WaitEventTimeout(&raw, timeout as c_int) ==
                            1 as c_int };
@@ -1133,15 +1134,15 @@ pub fn register_events(num: int) -> Option<uint> {
 }
 
 /// add an event to the event queue
-pub fn push_event(event: Event) -> Result<(), String> {
+pub fn push_event(event: Event) -> SdlResult<()> {
     match event.to_ll() {
         Some(raw_event) => {
             let ok = unsafe { ll::SDL_PushEvent(&raw_event) == 1 };
             if ok { Ok(()) }
             else { Err(get_error()) }
         },
         None => {
-            Err("Unsupport event type to push back to queue.".to_owned())
+            Err("Unsupport event type to push back to queue.".into_owned())
         }
     }
 }

src/sdl2/mouse.rs

@@ -1,6 +1,7 @@
 use std::ptr;
 
 use get_error;
+use SdlResult;
 use surface;
 use video;
 
@@ -87,7 +88,7 @@ impl Drop for Cursor {
 }
 
 impl Cursor {
-    pub fn new(data: &[u8], mask: &[u8], width: int, height: int, hot_x: int, hot_y: int) -> Result<Cursor, String> {
+    pub fn new(data: &[u8], mask: &[u8], width: int, height: int, hot_x: int, hot_y: int) -> SdlResult<Cursor> {
         unsafe {
             let raw = ll::SDL_CreateCursor(data.as_ptr(),
                                            mask.as_ptr(),
@@ -103,7 +104,7 @@ impl Cursor {
     }
 
     // TODO: figure out how to pass Surface in here correctly
-    pub fn from_surface(surface: &surface::Surface, hot_x: int, hot_y: int) -> Result<Cursor, String> {
+    pub fn from_surface(surface: &surface::Surface, hot_x: int, hot_y: int) -> SdlResult<Cursor> {
         unsafe {
             let raw = ll::SDL_CreateColorCursor(surface.raw(), hot_x as i32,
                                                 hot_y as i32);
@@ -116,7 +117,7 @@ impl Cursor {
         }
     }
 
-    pub fn from_system(cursor: SystemCursor) -> Result<Cursor, String> {
+    pub fn from_system(cursor: SystemCursor) -> SdlResult<Cursor> {
         unsafe {
             let raw = ll::SDL_CreateSystemCursor(cursor as u32);