Merge pull request #114 from gmorenz/update_rust

Update rust, ~str to StrBuf, std lib changes

Author: AngryLawyer

src/codegen/branchify.rs

@@ -7,7 +7,7 @@ use std::vec::Vec;
 
 struct ParseBranch {
     matches: Vec<u8>,
-    result: Option<~str>,
+    result: Option<StrBuf>,
     children: Vec<ParseBranch>,
 }
 
@@ -112,14 +112,14 @@ pub fn generate_branchified_method(
             let next_prefix = format!("{}{}", prefix, c as char);
             wf!("Some(b) if b == '{}' as u8 => match {} \\{", c as char, read_call);
             for b in branch.children.iter() {
-                r(writer, b, next_prefix, indent + 1, read_call, end, max_len, valid, unknown);
+                r(writer, b, next_prefix.as_slice(), indent + 1, read_call, end, max_len, valid, unknown);
             }
             match branch.result {
                 Some(ref result) => wf!("    Some(b) if b == SP => return Some({}),", *result),
                 None => wf!("    Some(b) if b == SP => return Some({}),",
-                                unknown.replace("{}", format!("~\"{}\"", next_prefix))),
+                                unknown.replace("{}", format!("~\"{}\"", next_prefix.as_slice()).as_slice())),
             }
-            wf!("    Some(b) if {} => (\"{}\", b),", valid, next_prefix);
+            wf!("    Some(b) if {} => (\"{}\", b),", valid, next_prefix.as_slice());
             wf!("    _ => return None,");
             wf!("\\},");
         }

src/codegen/keycode.rs

@@ -1,4 +1,5 @@
 use std::io::{IoResult,Writer};
+use std::path::BytesContainer;
 use super::get_writer;
 
 struct Key {
@@ -44,12 +45,12 @@ fn Key(code: uint, ident: &'static str) -> Key {
 }
 
 impl Key {
-    fn ident(&self) -> ~str {
+    fn ident(&self) -> StrBuf {
         self.ident.to_owned()
     }
 
-    fn padded_ident(&self) -> ~str {
-        self.ident() + " ".repeat(unsafe { longest_ident } - self.ident().len())
+    fn padded_ident(&self) -> StrBuf {
+        self.ident().append(" ".repeat(unsafe { longest_ident } - self.ident().len()).as_slice())
     }
 
 }
@@ -313,7 +314,7 @@ use std::num::ToPrimitive;
 pub enum KeyCode {
 ".as_bytes()));
     for &entry in entries.iter() {
-        try!(out.write(format!("    {} = {},\n", entry.padded_ident(), entry.code).into_bytes()));
+        try!(out.write(format!("    {} = {},\n", entry.padded_ident(), entry.code).container_as_bytes()));
     }
 
     try!(out.write("
@@ -332,7 +333,7 @@ impl KeyCode {
         match *self {
 ".as_bytes()));
     for &entry in entries.iter() {
-        try!(out.write(format!("            {} => {},\n", entry.padded_ident(), entry.code).into_bytes()));
+        try!(out.write(format!("            {} => {},\n", entry.padded_ident(), entry.code).container_as_bytes()));
     }
     try!(out.write("
         }
@@ -346,7 +347,7 @@ impl ToPrimitive for KeyCode {
     for primitive_type in types.iter() {
         try!(out.write(format!("fn to_{}(&self) -> Option<{}> \\{
             Some(self.code() as {})
-        \\}\n", *primitive_type, *primitive_type, *primitive_type).into_bytes()));
+        \\}\n", *primitive_type, *primitive_type, *primitive_type).container_as_bytes()));
     }
 
 try!(out.write("
@@ -364,9 +365,9 @@ impl FromPrimitive for KeyCode {
         try!(out.write(format!("
     fn from_{}(n: {}) -> Option<KeyCode> \\{
         match n \\{
-", *primitive_type, *primitive_type).into_bytes()));
+", *primitive_type, *primitive_type).container_as_bytes()));
         for &entry in entries.iter() {
-            try!(out.write(format!("            {} => Some({}),\n", entry.code, entry.ident()).into_bytes()));
+            try!(out.write(format!("            {} => Some({}),\n", entry.code, entry.ident()).container_as_bytes()));
         }
         try!(out.write("
                 _   => { Some(UnknownKey) }

src/codegen/main.rs

@@ -27,12 +27,12 @@ fn main() {
                 Ok(_) => {},
             };
 
-            if "keycode.rs" == *args.get(1) {
+            if "keycode.rs" == args.get(1).as_slice() {
                 match keycode::generate(&output_dir) {
                     Ok(_) => {},
                     Err(e) => fail!("Could not automatically generate sources for keycodes: {:s}", e.desc),
                 };
-            } else if "scancode.rs" == *args.get(1) {
+            } else if "scancode.rs" == args.get(1).as_slice() {
                 match scancode::generate(&output_dir) {
                     Ok(_)    => {},
                     Err(e) => fail!("Could not automatically generate sources for scancodes: {:s}", e.desc),

src/codegen/scancode.rs

@@ -1,4 +1,5 @@
 use std::io::{IoResult,Writer};
+use std::path::BytesContainer;
 use super::get_writer;
 
 struct ScanCode {
@@ -43,12 +44,12 @@ fn ScanCode(code: uint, ident: &'static str) -> ScanCode {
 }
 
 impl ScanCode {
-    fn ident(&self) -> ~str {
+    fn ident(&self) -> StrBuf {
         self.ident.to_owned()
     }
 
-    fn padded_ident(&self) -> ~str {
-        self.ident() + " ".repeat(unsafe { longest_ident } - self.ident().len())
+    fn padded_ident(&self) -> StrBuf {
+        self.ident().append(" ".repeat(unsafe { longest_ident } - self.ident().len()).as_slice())
     }
 
 }
@@ -319,7 +320,7 @@ use std::num::ToPrimitive;
 pub enum ScanCode {
 ".as_bytes()));
     for &entry in entries.iter() {
-        try!(out.write(format!("    {} = {},\n", entry.padded_ident(), entry.code).into_bytes()));
+        try!(out.write(format!("    {} = {},\n", entry.padded_ident(), entry.code).container_as_bytes()));
     }
 
     try!(out.write("
@@ -338,7 +339,7 @@ impl ScanCode {
         match *self {
 ".as_bytes()));
     for &entry in entries.iter() {
-        try!(out.write(format!("            {} => {},\n", entry.padded_ident(), entry.code).into_bytes()));
+        try!(out.write(format!("            {} => {},\n", entry.padded_ident(), entry.code).container_as_bytes()));
     }
 
     try!(out.write("
@@ -355,7 +356,7 @@ impl ToPrimitive for ScanCode {
     for primitive_type in types.iter() {
         try!(out.write(format!("fn to_{}(&self) -> Option<{}> \\{
             Some(self.code() as {})
-        \\}\n", *primitive_type, *primitive_type, *primitive_type).into_bytes()));
+        \\}\n", *primitive_type, *primitive_type, *primitive_type).container_as_bytes()));
     }
 
 try!(out.write("
@@ -374,10 +375,10 @@ impl FromPrimitive for ScanCode {
         try!(out.write(format!("
     fn from_{}(n: {}) -> Option<ScanCode> \\{
         match n \\{
-", *primitive_type, *primitive_type).into_bytes()));
+", *primitive_type, *primitive_type).container_as_bytes()));
 
         for &entry in entries.iter() {
-            try!(out.write(format!("            {} => Some({}),\n", entry.code, entry.ident()).into_bytes()));
+            try!(out.write(format!("            {} => Some({}),\n", entry.code, entry.ident()).container_as_bytes()));
         }
 
         try!(out.write("

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) -> ~str {
+pub fn get_audio_driver(index: int) -> StrBuf {
     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) -> ~str {
+pub fn get_audio_device_name(index: int, iscapture: int) -> StrBuf {
     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<(), ~str> {
+pub fn audio_init(name: &str) -> Result<(), StrBuf> {
     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() -> ~str {
+pub fn get_current_audio_driver() -> StrBuf {
     unsafe {
         let buf = ll::SDL_GetCurrentAudioDriver();
         CString::new(buf, false).as_str().unwrap().into_owned()
@@ -221,11 +221,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>), ~str> {
+    pub fn load_wav(path: &Path) -> Result<(AudioSpec, CVec<u8>), StrBuf> {
         AudioSpec::load_wav_rw(&try!(RWops::from_file(path, "rb")))
     }
 
-    pub fn load_wav_rw(src: &RWops) -> Result<(AudioSpec, CVec<u8>), ~str> {
+    pub fn load_wav_rw(src: &RWops) -> Result<(AudioSpec, CVec<u8>), StrBuf> {
         assert_eq!(mem::size_of::<AudioSpec>(), mem::size_of::<ll::SDL_AudioSpec>());
         let mut spec = unsafe { mem::uninit::<AudioSpec>() };
         let audio_buf = ptr::null::<u8>();
@@ -261,7 +261,7 @@ impl AudioDevice {
         }
     }
 
-    pub fn open(device: Option<&str>, iscapture: int, spec: &AudioSpec) -> Result<(AudioDevice, AudioSpec), ~str> {
+    pub fn open(device: Option<&str>, iscapture: int, spec: &AudioSpec) -> Result<(AudioDevice, AudioSpec), StrBuf> {
         //! SDL_OpenAudioDevice
         let obtained = unsafe { mem::uninit::<AudioSpec>() };
         unsafe {
@@ -331,7 +331,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, ~str> {
+               dst_format: AudioFormat, dst_channels: u8, dst_rate: int) -> Result<AudioCVT, StrBuf> {
         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,
@@ -345,7 +345,7 @@ impl AudioCVT {
         }
     }
 
-    pub fn convert(&self, src: CVec<u8>) -> Result<CVec<u8>, ~str> {
+    pub fn convert(&self, src: CVec<u8>) -> Result<CVec<u8>, StrBuf> {
         //! 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, ~str, int, int),
+    TextEditingEvent(uint, video::Window, StrBuf, int, int),
     /// (timestamp, window, text)
-    TextInputEvent(uint, video::Window, ~str),
+    TextInputEvent(uint, video::Window, StrBuf),
 
     /// (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, ~str),
+    DropFileEvent(uint, StrBuf),
 
     /// (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, ~str> {
+pub fn wait_event() -> Result<Event, StrBuf> {
     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, ~str> {
 }
 
 /// Wait until the specified timeout (in milliseconds) for the next available event.
-pub fn wait_event_timeout(timeout: int) -> Result<Event, ~str> {
+pub fn wait_event_timeout(timeout: int) -> Result<Event, StrBuf> {
     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<(), ~str> {
+pub fn push_event(event: Event) -> Result<(), StrBuf> {
     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) -> ~str {
+pub fn get_scancode_name(scancode: ScanCode) -> StrBuf {
     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) -> ~str {
+pub fn get_key_name(key: KeyCode) -> StrBuf {
     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, ~str> {
+    pub fn new(data: &[u8], mask: &[u8], width: int, height: int, hot_x: int, hot_y: int) -> Result<Cursor, StrBuf> {
         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, ~str> {
+    pub fn from_surface(surface: &surface::Surface, hot_x: int, hot_y: int) -> Result<Cursor, StrBuf> {
         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, ~str> {
+    pub fn from_system(cursor: SystemCursor) -> Result<Cursor, StrBuf> {
         unsafe {
             let raw = ll::SDL_CreateSystemCursor(cursor as u32);