Merge pull request #115 from AngryLawyer/strbuf-to-string

Updated to match latest changes to strings

Author: AngryLawyer

src/codegen/branchify.rs

@@ -7,7 +7,7 @@ use std::vec::Vec;
 
 struct ParseBranch {
     matches: Vec<u8>,
-    result: Option<StrBuf>,
+    result: Option<String>,
     children: Vec<ParseBranch>,
 }
 
@@ -28,7 +28,7 @@ pub fn branchify(options: &[(&str, &str)], case_sensitive: bool) -> Vec<ParseBra
     fn go_down_moses(branch: &mut ParseBranch, mut chariter: Chars, result: &str, case_sensitive: bool) {
         match chariter.next() {
             Some(c) => {
-                let first_case = if case_sensitive { c as u8 } else { c.to_ascii().to_upper().to_byte() };
+                let first_case = if case_sensitive { c as u8 } else { c.to_ascii().to_uppercase().to_byte() };
                 for next_branch in branch.children.mut_iter() {
                     if next_branch.matches.as_slice()[0] == first_case {
                         go_down_moses(next_branch, chariter, result, case_sensitive);
@@ -38,7 +38,7 @@ pub fn branchify(options: &[(&str, &str)], case_sensitive: bool) -> Vec<ParseBra
                 let mut subbranch = ParseBranch::new();
                 subbranch.matches.push(first_case);
                 if !case_sensitive {
-                    let second_case = c.to_ascii().to_lower().to_byte();
+                    let second_case = c.to_ascii().to_lowercase().to_byte();
                     if first_case != second_case {
                         subbranch.matches.push(second_case);
                     }

src/codegen/keycode.rs

@@ -45,11 +45,11 @@ fn Key(code: uint, ident: &'static str) -> Key {
 }
 
 impl Key {
-    fn ident(&self) -> StrBuf {
+    fn ident(&self) -> String {
         self.ident.to_owned()
     }
 
-    fn padded_ident(&self) -> StrBuf {
+    fn padded_ident(&self) -> String {
         self.ident().append(" ".repeat(unsafe { longest_ident } - self.ident().len()).as_slice())
     }
 

src/codegen/scancode.rs

@@ -44,11 +44,11 @@ fn ScanCode(code: uint, ident: &'static str) -> ScanCode {
 }
 
 impl ScanCode {
-    fn ident(&self) -> StrBuf {
+    fn ident(&self) -> String {
         self.ident.to_owned()
     }
 
-    fn padded_ident(&self) -> StrBuf {
+    fn padded_ident(&self) -> String {
         self.ident().append(" ".repeat(unsafe { longest_ident } - self.ident().len()).as_slice())
     }
 

src/sdl2/audio.rs

@@ -152,7 +152,7 @@ pub fn get_num_audio_drivers() -> int {
     unsafe { ll::SDL_GetNumAudioDrivers() as int }
 }
 
-pub fn get_audio_driver(index: int) -> StrBuf {
+pub fn get_audio_driver(index: int) -> String {
     unsafe {
         let buf = ll::SDL_GetAudioDriver(index as c_int);
         CString::new(buf, false).as_str().unwrap().into_owned()
@@ -163,14 +163,14 @@ pub fn get_num_audio_devices(iscapture: int) -> int {
     unsafe { ll::SDL_GetNumAudioDevices(iscapture as c_int) as int }
 }
 
-pub fn get_audio_device_name(index: int, iscapture: int) -> StrBuf {
+pub fn get_audio_device_name(index: int, iscapture: int) -> String {
     unsafe {
         let buf = ll::SDL_GetAudioDeviceName(index as c_int, iscapture as c_int);
         CString::new(buf, false).as_str().unwrap().into_owned()
     }
 }
 
-pub fn audio_init(name: &str) -> Result<(), StrBuf> {
+pub fn audio_init(name: &str) -> Result<(), String> {
     let ret = name.with_c_str(|buf| {
             unsafe { ll::SDL_AudioInit(buf) }
         });
@@ -185,7 +185,7 @@ pub fn audio_quit() {
     unsafe { ll::SDL_AudioQuit() }
 }
 
-pub fn get_current_audio_driver() -> StrBuf {
+pub fn get_current_audio_driver() -> String {
     unsafe {
         let buf = ll::SDL_GetCurrentAudioDriver();
         CString::new(buf, false).as_str().unwrap().into_owned()
@@ -221,13 +221,13 @@ 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>), StrBuf> {
+    pub fn load_wav(path: &Path) -> Result<(AudioSpec, CVec<u8>), String> {
         AudioSpec::load_wav_rw(&try!(RWops::from_file(path, "rb")))
     }
 
-    pub fn load_wav_rw(src: &RWops) -> Result<(AudioSpec, CVec<u8>), StrBuf> {
+    pub fn load_wav_rw(src: &RWops) -> Result<(AudioSpec, CVec<u8>), String> {
         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 {
@@ -261,9 +261,9 @@ impl AudioDevice {
         }
     }
 
-    pub fn open(device: Option<&str>, iscapture: int, spec: &AudioSpec) -> Result<(AudioDevice, AudioSpec), StrBuf> {
+    pub fn open(device: Option<&str>, iscapture: int, spec: &AudioSpec) -> Result<(AudioDevice, AudioSpec), String> {
         //! SDL_OpenAudioDevice
-        let obtained = unsafe { mem::uninit::<AudioSpec>() };
+        let obtained = unsafe { mem::uninitialized::<AudioSpec>() };
         unsafe {
             let device_c_str = match device {
                 None => ptr::null(),
@@ -334,7 +334,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, StrBuf> {
+               dst_format: AudioFormat, dst_channels: u8, dst_rate: int) -> Result<AudioCVT, String> {
         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,7 +348,7 @@ impl AudioCVT {
         }
     }
 
-    pub fn convert(&self, src: CVec<u8>) -> Result<CVec<u8>, StrBuf> {
+    pub fn convert(&self, src: CVec<u8>) -> Result<CVec<u8>, String> {
         //! Convert audio data to a desired audio format.
 
         unsafe {

src/sdl2/event.rs

@@ -563,9 +563,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, StrBuf, int, int),
+    TextEditingEvent(uint, video::Window, String, int, int),
     /// (timestamp, window, text)
-    TextInputEvent(uint, video::Window, StrBuf),
+    TextInputEvent(uint, video::Window, String),
 
     /// (timestamp, window, which, [MouseState], x, y, xrel, yrel)
     MouseMotionEvent(uint, video::Window, uint, MouseState, int, int,
@@ -614,7 +614,7 @@ pub enum Event {
     ClipboardUpdateEvent(uint),
 
     /// (timestamp, filename)
-    DropFileEvent(uint, StrBuf),
+    DropFileEvent(uint, String),
 
     /// (timestamp, Window, type, code)
     UserEvent(uint, video::Window, uint, int),
@@ -1062,7 +1062,7 @@ pub fn poll_event() -> Event {
 }
 
 /// Wait indefinitely for the next available event.
-pub fn wait_event() -> Result<Event, StrBuf> {
+pub fn wait_event() -> Result<Event, String> {
     let raw = null_event();
     let success = unsafe { ll::SDL_WaitEvent(&raw) == 1 as c_int };
 
@@ -1071,7 +1071,7 @@ pub fn wait_event() -> Result<Event, StrBuf> {
 }
 
 /// Wait until the specified timeout (in milliseconds) for the next available event.
-pub fn wait_event_timeout(timeout: int) -> Result<Event, StrBuf> {
+pub fn wait_event_timeout(timeout: int) -> Result<Event, String> {
     let raw = null_event();
     let success = unsafe { ll::SDL_WaitEventTimeout(&raw, timeout as c_int) ==
                            1 as c_int };
@@ -1133,7 +1133,7 @@ pub fn register_events(num: int) -> Option<uint> {
 }
 
 /// add an event to the event queue
-pub fn push_event(event: Event) -> Result<(), StrBuf> {
+pub fn push_event(event: Event) -> Result<(), String> {
     match event.to_ll() {
         Some(raw_event) => {
             let ok = unsafe { ll::SDL_PushEvent(&raw_event) == 1 };

src/sdl2/keyboard.rs

@@ -114,7 +114,7 @@ pub fn get_scancode_from_key(key: KeyCode) -> ScanCode {
     }
 }
 
-pub fn get_scancode_name(scancode: ScanCode) -> StrBuf {
+pub fn get_scancode_name(scancode: ScanCode) -> String {
     unsafe {
         str::raw::from_c_str(ll::SDL_GetScancodeName(scancode.code() as u32))
     }
@@ -128,7 +128,7 @@ pub fn get_scancode_from_name(name: &str) -> ScanCode {
     }
 }
 
-pub fn get_key_name(key: KeyCode) -> StrBuf {
+pub fn get_key_name(key: KeyCode) -> String {
     unsafe {
         str::raw::from_c_str(ll::SDL_GetKeyName(key.code()))
     }

src/sdl2/mouse.rs

@@ -87,7 +87,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, StrBuf> {
+    pub fn new(data: &[u8], mask: &[u8], width: int, height: int, hot_x: int, hot_y: int) -> Result<Cursor, String> {
         unsafe {
             let raw = ll::SDL_CreateCursor(data.as_ptr(),
                                            mask.as_ptr(),
@@ -103,7 +103,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, StrBuf> {
+    pub fn from_surface(surface: &surface::Surface, hot_x: int, hot_y: int) -> Result<Cursor, String> {
         unsafe {
             let raw = ll::SDL_CreateColorCursor(surface.raw(), hot_x as i32,
                                                 hot_y as i32);
@@ -116,7 +116,7 @@ impl Cursor {
         }
     }
 
-    pub fn from_system(cursor: SystemCursor) -> Result<Cursor, StrBuf> {
+    pub fn from_system(cursor: SystemCursor) -> Result<Cursor, String> {
         unsafe {
             let raw = ll::SDL_CreateSystemCursor(cursor as u32);