From 977845acfd6701bb4e15d4bc5ebb94986a10bf30 Mon Sep 17 00:00:00 2001
From: Vladimir Matveev <vladimir.matweev@gmail.com>
Date: Mon, 26 May 2014 20:03:26 +0400
Subject: [PATCH] Fixed incorrectly merged files

---
 src/sdl2/audio.rs  | 4 ++--
 src/sdl2/event.rs  | 6 +++---
 src/sdl2/render.rs | 2 +-
 src/sdl2/sdl.rs    | 2 ++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/sdl2/audio.rs b/src/sdl2/audio.rs
index 915728ba..a6a41df3 100644
--- a/src/sdl2/audio.rs
+++ b/src/sdl2/audio.rs
@@ -228,7 +228,7 @@ impl<'a> AudioSpec<'a> {
 
     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::uninit::<AudioSpec>() };
+        let mut spec = unsafe { mem::uninitialized::<AudioSpec>() };
         let audio_buf = ptr::null::<u8>();
         let audio_len = 0u32;
         unsafe {
@@ -264,7 +264,7 @@ impl AudioDevice {
 
     pub fn open(device: Option<&str>, iscapture: int, spec: &AudioSpec) -> SdlResult<(AudioDevice, AudioSpec)> {
         //! SDL_OpenAudioDevice
-        let obtained = unsafe { mem::uninit::<AudioSpec>() };
+        let obtained = unsafe { mem::uninitialized::<AudioSpec>() };
         unsafe {
             let device_c_str = match device {
                 None => ptr::null(),
diff --git a/src/sdl2/event.rs b/src/sdl2/event.rs
index bf6560d0..5b494a3c 100644
--- a/src/sdl2/event.rs
+++ b/src/sdl2/event.rs
@@ -564,9 +564,9 @@ pub enum Event {
     KeyDownEvent(uint, video::Window, KeyCode, ScanCode, Mod),
     KeyUpEvent(uint, video::Window, KeyCode, ScanCode, Mod),
     /// (timestamp, window, text, start, length)
-    TextEditingEvent(uint, video::Window, ~str, int, int),
+    TextEditingEvent(uint, video::Window, String, int, int),
     /// (timestamp, window, text)
-    TextInputEvent(uint, video::Window, ~str),
+    TextInputEvent(uint, video::Window, String),
 
     /// (timestamp, window, which, [MouseState], x, y, xrel, yrel)
     MouseMotionEvent(uint, video::Window, uint, MouseState, int, int,
@@ -615,7 +615,7 @@ pub enum Event {
     ClipboardUpdateEvent(uint),
 
     /// (timestamp, filename)
-    DropFileEvent(uint, ~str),
+    DropFileEvent(uint, String),
 
     /// (timestamp, Window, type, code)
     UserEvent(uint, video::Window, uint, int),
diff --git a/src/sdl2/render.rs b/src/sdl2/render.rs
index c4eb7714..b4fbbc4a 100644
--- a/src/sdl2/render.rs
+++ b/src/sdl2/render.rs
@@ -498,7 +498,7 @@ impl<S> Renderer<S> {
         else { Err(get_error()) }
     }
 
-    pub fn fill_rect(&self, rect: &Rect) -> Result<(), ~str> {
+    pub fn fill_rect(&self, rect: &Rect) -> Result<(), String> {
         let ret = unsafe { ll::SDL_RenderFillRect(self.raw, rect) };
 
         if ret == 0 { Ok(()) }
diff --git a/src/sdl2/sdl.rs b/src/sdl2/sdl.rs
index 8b32eb85..7eaa72c0 100644
--- a/src/sdl2/sdl.rs
+++ b/src/sdl2/sdl.rs
@@ -83,6 +83,8 @@ pub enum Error {
     UnsupportedError = ll::SDL_UNSUPPORTED as int
 }
 
+pub type SdlResult<T> = Result<T, String>;
+
 pub fn init(flags: InitFlag) -> bool {
     unsafe {
         ll::SDL_Init(flags.bits()) == 0