---

yaml
---
r: 124099
b: refs/heads/master
c: 211f1ca
h: refs/heads/master
i:
  124097: 2311ebf
  124095: e90f90a
v: v3

Author: aochagavia

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: cd54321c085da9e40dd340b738547f7287e3c579
+refs/heads/master: 211f1caa290d83a3e24ad99d53395975a3981014
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: afbcbbc77ffc6b10053bc543daf7d2e05d68cc01
 refs/heads/try: 296eb104620b346d88bc4a2c2ab7693e6d3db019

trunk/src/compiletest/procsrv.rs

@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::str;
 use std::io::process::{ProcessExit, Command, Process, ProcessOutput};
 use std::dynamic_lib::DynamicLibrary;
 
@@ -25,7 +24,7 @@ fn add_target_env(cmd: &mut Command, lib_path: &str, aux_path: Option<&str>) {
     // Add the new dylib search path var
     let var = DynamicLibrary::envvar();
     let newpath = DynamicLibrary::create_path(path.as_slice());
-    let newpath = str::from_utf8(newpath.as_slice()).unwrap().to_string();
+    let newpath = String::from_utf8(newpath).unwrap();
     cmd.env(var.to_string(), newpath);
 }
 
@@ -55,8 +54,8 @@ pub fn run(lib_path: &str,
 
             Some(Result {
                 status: status,
-                out: str::from_utf8(output.as_slice()).unwrap().to_string(),
-                err: str::from_utf8(error.as_slice()).unwrap().to_string()
+                out: String::from_utf8(output).unwrap(),
+                err: String::from_utf8(error).unwrap()
             })
         },
         Err(..) => None

trunk/src/compiletest/runtest.rs

@@ -158,7 +158,7 @@ fn run_pretty_test(config: &Config, props: &TestProps, testfile: &Path) {
         match props.pp_exact { Some(_) => 1, None => 2 };
 
     let src = File::open(testfile).read_to_end().unwrap();
-    let src = str::from_utf8(src.as_slice()).unwrap().to_string();
+    let src = String::from_utf8(src.clone()).unwrap();
     let mut srcs = vec!(src);
 
     let mut round = 0;
@@ -185,10 +185,10 @@ fn run_pretty_test(config: &Config, props: &TestProps, testfile: &Path) {
         Some(ref file) => {
             let filepath = testfile.dir_path().join(file);
             let s = File::open(&filepath).read_to_end().unwrap();
-            str::from_utf8(s.as_slice()).unwrap().to_string()
-          }
-          None => { (*srcs.get(srcs.len() - 2u)).clone() }
-        };
+            String::from_utf8(s).unwrap()
+        }
+        None => { (*srcs.get(srcs.len() - 2u)).clone() }
+    };
     let mut actual = (*srcs.get(srcs.len() - 1u)).clone();
 
     if props.pp_exact.is_some() {
@@ -582,8 +582,8 @@ fn run_debuginfo_lldb_test(config: &Config, props: &TestProps, testfile: &Path)
                     process.wait_with_output().unwrap();
 
                 (status,
-                 str::from_utf8(output.as_slice()).unwrap().to_string(),
-                 str::from_utf8(error.as_slice()).unwrap().to_string())
+                 String::from_utf8(output).unwrap(),
+                 String::from_utf8(error).unwrap())
             },
             Err(e) => {
                 fatal(format!("Failed to setup Python process for \

trunk/src/libcollections/str.rs

@@ -107,6 +107,7 @@ Section: Creating a string
 /// let string = str::from_utf8_owned(hello_vec);
 /// assert_eq!(string, Ok("hello".to_string()));
 /// ```
+#[deprecated = "Replaced by `String::from_utf8`"]
 pub fn from_utf8_owned(vv: Vec<u8>) -> Result<String, Vec<u8>> {
     String::from_utf8(vv)
 }
@@ -139,9 +140,7 @@ pub fn from_byte(b: u8) -> String {
 /// assert_eq!(string.as_slice(), "b");
 /// ```
 pub fn from_char(ch: char) -> String {
-    let mut buf = String::new();
-    buf.push_char(ch);
-    buf
+    String::from_char(ch)
 }
 
 /// Convert a vector of chars to a string
@@ -2175,19 +2174,6 @@ String::from_str("\u1111\u1171\u11b6"));
         assert_eq!(from_utf8(xs), None);
     }
 
-    #[test]
-    fn test_str_from_utf8_owned() {
-        let xs = Vec::from_slice(b"hello");
-        assert_eq!(from_utf8_owned(xs), Ok(String::from_str("hello")));
-
-        let xs = Vec::from_slice("ศไทย中华Việt Nam".as_bytes());
-        assert_eq!(from_utf8_owned(xs), Ok(String::from_str("ศไทย中华Việt Nam")));
-
-        let xs = Vec::from_slice(b"hello\xFF");
-        assert_eq!(from_utf8_owned(xs),
-                   Err(Vec::from_slice(b"hello\xFF")));
-    }
-
     #[test]
     fn test_str_from_utf8_lossy() {
         let xs = b"hello";

trunk/src/libcollections/string.rs

@@ -75,6 +75,14 @@ impl String {
     ///
     /// Returns `Err` with the original vector if the vector contains invalid
     /// UTF-8.
+    ///
+    /// # Example
+    ///
+    /// ```rust
+    /// let hello_vec = vec![104, 101, 108, 108, 111];
+    /// let string = String::from_utf8(hello_vec);
+    /// assert_eq!(string, Ok("hello".to_string()));
+    /// ```
     #[inline]
     pub fn from_utf8(vec: Vec<u8>) -> Result<String, Vec<u8>> {
         if str::is_utf8(vec.as_slice()) {
@@ -391,6 +399,19 @@ mod tests {
         });
     }
 
+    #[test]
+    fn test_str_from_utf8() {
+        let xs = Vec::from_slice(b"hello");
+        assert_eq!(String::from_utf8(xs), Ok("hello".to_string()));
+
+        let xs = Vec::from_slice("ศไทย中华Việt Nam".as_bytes());
+        assert_eq!(String::from_utf8(xs), Ok("ศไทย中华Việt Nam".to_string()));
+
+        let xs = Vec::from_slice(b"hello\xFF");
+        assert_eq!(String::from_utf8(xs),
+                   Err(Vec::from_slice(b"hello\xFF")));
+    }
+
     #[test]
     fn test_push_bytes() {
         let mut s = String::from_str("ABC");

trunk/src/libdebug/repr.rs

@@ -575,7 +575,6 @@ struct P {a: int, b: f64}
 
 #[test]
 fn test_repr() {
-    use std::str;
     use std::io::stdio::println;
     use std::char::is_alphabetic;
     use std::mem::swap;
@@ -584,7 +583,7 @@ fn test_repr() {
     fn exact_test<T>(t: &T, e:&str) {
         let mut m = io::MemWriter::new();
         write_repr(&mut m as &mut io::Writer, t).unwrap();
-        let s = str::from_utf8(m.unwrap().as_slice()).unwrap().to_string();
+        let s = String::from_utf8(m.unwrap()).unwrap();
         assert_eq!(s.as_slice(), e);
     }
 

trunk/src/libregex/test/bench.rs

@@ -163,7 +163,7 @@ fn gen_text(n: uint) -> String {
             *b = '\n' as u8
         }
     }
-    str::from_utf8(bytes.as_slice()).unwrap().to_string()
+    String::from_utf8(bytes).unwrap()
 }
 
 throughput!(easy0_32, easy0(), 32)

trunk/src/librustc/back/link.rs

@@ -380,8 +380,7 @@ pub mod write {
                     sess.note(format!("{}", &cmd).as_slice());
                     let mut note = prog.error.clone();
                     note.push_all(prog.output.as_slice());
-                    sess.note(str::from_utf8(note.as_slice()).unwrap()
-                                                             .as_slice());
+                    sess.note(str::from_utf8(note.as_slice()).unwrap());
                     sess.abort_if_errors();
                 }
             },
@@ -1177,8 +1176,7 @@ fn link_natively(sess: &Session, trans: &CrateTranslation, dylib: bool,
                 sess.note(format!("{}", &cmd).as_slice());
                 let mut output = prog.error.clone();
                 output.push_all(prog.output.as_slice());
-                sess.note(str::from_utf8(output.as_slice()).unwrap()
-                                                           .as_slice());
+                sess.note(str::from_utf8(output.as_slice()).unwrap());
                 sess.abort_if_errors();
             }
         },

trunk/src/librustc/driver/mod.rs

@@ -82,8 +82,7 @@ fn run_compiler(args: &[String]) {
             let ifile = matches.free.get(0).as_slice();
             if ifile == "-" {
                 let contents = io::stdin().read_to_end().unwrap();
-                let src = str::from_utf8(contents.as_slice()).unwrap()
-                                                             .to_string();
+                let src = String::from_utf8(contents).unwrap();
                 (StrInput(src), None)
             } else {
                 (FileInput(Path::new(ifile)), Some(Path::new(ifile)))

trunk/src/librustc/metadata/encoder.rs

@@ -1922,5 +1922,5 @@ pub fn encoded_ty(tcx: &ty::ctxt, t: ty::t) -> String {
         tcx: tcx,
         abbrevs: &RefCell::new(HashMap::new())
     }, t);
-    str::from_utf8_owned(Vec::from_slice(wr.get_ref())).unwrap().to_string()
+    str::from_utf8(wr.get_ref()).unwrap().to_string()
 }

trunk/src/librustdoc/html/render.rs

@@ -460,7 +460,7 @@ fn build_index(krate: &clean::Crate, cache: &mut Cache) -> io::IoResult<String>
 
     try!(write!(&mut w, "]}};"));
 
-    Ok(str::from_utf8(w.unwrap().as_slice()).unwrap().to_string())
+    Ok(String::from_utf8(w.unwrap()).unwrap())
 }
 
 fn write_shared(cx: &Context,

trunk/src/librustdoc/lib.rs

@@ -429,7 +429,7 @@ fn json_output(krate: clean::Crate, res: Vec<plugins::PluginJson> ,
             let mut encoder = json::Encoder::new(&mut w as &mut io::Writer);
             krate.encode(&mut encoder).unwrap();
         }
-        str::from_utf8_owned(w.unwrap()).unwrap()
+        String::from_utf8(w.unwrap()).unwrap()
     };
     let crate_json = match json::from_str(crate_json_str.as_slice()) {
         Ok(j) => j,

trunk/src/librustuv/uvll.rs

@@ -109,32 +109,20 @@ pub struct uv_buf_t {
     pub len: uv_buf_len_t,
 }
 
-#[cfg(unix)]
-pub type uv_os_socket_t = c_int;
-
 // see libuv/include/uv-win.h
 #[cfg(windows)]
 pub struct uv_buf_t {
     pub len: uv_buf_len_t,
     pub base: *mut u8,
 }
 
-#[cfg(windows)]
-pub type uv_os_socket_t = libc::SOCKET;
-
 #[repr(C)]
 pub enum uv_run_mode {
     RUN_DEFAULT = 0,
     RUN_ONCE,
     RUN_NOWAIT,
 }
 
-#[repr(C)]
-pub enum uv_poll_event {
-    UV_READABLE = 1,
-    UV_WRITABLE = 2,
-}
-
 pub struct uv_process_options_t {
     pub exit_cb: uv_exit_cb,
     pub file: *const libc::c_char,
@@ -162,7 +150,6 @@ pub type uv_loop_t = c_void;
 pub type uv_idle_t = c_void;
 pub type uv_tcp_t = c_void;
 pub type uv_udp_t = c_void;
-pub type uv_poll_t = c_void;
 pub type uv_connect_t = c_void;
 pub type uv_connection_t = c_void;
 pub type uv_write_t = c_void;
@@ -246,9 +233,6 @@ pub type uv_udp_recv_cb = extern "C" fn(handle: *mut uv_udp_t,
                                         addr: *const sockaddr,
                                         flags: c_uint);
 pub type uv_close_cb = extern "C" fn(handle: *mut uv_handle_t);
-pub type uv_poll_cb = extern "C" fn(handle: *mut uv_poll_t,
-                                    status: c_int,
-                                    events: c_int);
 pub type uv_walk_cb = extern "C" fn(handle: *mut uv_handle_t,
                                     arg: *mut c_void);
 pub type uv_async_cb = extern "C" fn(handle: *mut uv_async_t);
@@ -667,11 +651,6 @@ extern {
     pub fn uv_fs_lstat(handle: *mut uv_loop_t, req: *mut uv_fs_t,
                        file: *const c_char, cb: uv_fs_cb) -> c_int;
 
-    // poll bindings
-    pub fn uv_poll_init_socket(l: *mut uv_loop_t, h: *mut uv_poll_t, s: uv_os_socket_t) -> c_int;
-    pub fn uv_poll_start(h: *mut uv_poll_t, events: c_int, cb: uv_poll_cb) -> c_int;
-    pub fn uv_poll_stop(h: *mut uv_poll_t) -> c_int;
-
     // getaddrinfo
     pub fn uv_getaddrinfo(loop_: *mut uv_loop_t, req: *mut uv_getaddrinfo_t,
                           getaddrinfo_cb: uv_getaddrinfo_cb,

trunk/src/libserialize/base64.rs

@@ -146,7 +146,7 @@ impl<'a> ToBase64 for &'a [u8] {
         }
 
         unsafe {
-            str::raw::from_utf8(v.as_slice()).to_string()
+            str::raw::from_utf8_owned(v)
         }
     }
 }

trunk/src/libserialize/hex.rs

@@ -45,7 +45,7 @@ impl<'a> ToHex for &'a [u8] {
         }
 
         unsafe {
-            str::raw::from_utf8(v.as_slice()).to_string()
+            str::raw::from_utf8_owned(v)
         }
     }
 }

trunk/src/libserialize/json.rs

@@ -240,7 +240,7 @@ pub fn decode<T: ::Decodable<Decoder, DecoderError>>(s: &str) -> DecodeResult<T>
 /// Shortcut function to encode a `T` into a JSON `String`
 pub fn encode<'a, T: Encodable<Encoder<'a>, io::IoError>>(object: &T) -> String {
     let buff = Encoder::buffer_encode(object);
-    str::from_utf8_owned(buff).unwrap()
+    String::from_utf8(buff).unwrap()
 }
 
 impl fmt::Show for ErrorCode {
@@ -517,8 +517,7 @@ impl<'a> ::Encoder<io::IoError> for Encoder<'a> {
             let mut check_encoder = Encoder::new(&mut buf);
             try!(f(transmute(&mut check_encoder)));
         }
-        let out = str::from_utf8_owned(buf.unwrap()).unwrap();
-        let out = out.as_slice();
+        let out = str::from_utf8(buf.get_ref()).unwrap();
         let needs_wrapping = out.char_at(0) != '"' && out.char_at_reverse(out.len()) != '"';
         if needs_wrapping { try!(write!(self.writer, "\"")); }
         try!(f(self));
@@ -762,8 +761,7 @@ impl<'a> ::Encoder<io::IoError> for PrettyEncoder<'a> {
             let mut check_encoder = PrettyEncoder::new(&mut buf);
             try!(f(transmute(&mut check_encoder)));
         }
-        let out = str::from_utf8_owned(buf.unwrap()).unwrap();
-        let out = out.as_slice();
+        let out = str::from_utf8(buf.get_ref()).unwrap();
         let needs_wrapping = out.char_at(0) != '"' && out.char_at_reverse(out.len()) != '"';
         if needs_wrapping { try!(write!(self.writer, "\"")); }
         try!(f(self));
@@ -810,7 +808,7 @@ impl Json {
     pub fn to_pretty_str(&self) -> String {
         let mut s = MemWriter::new();
         self.to_pretty_writer(&mut s as &mut io::Writer).unwrap();
-        str::from_utf8_owned(s.unwrap()).unwrap()
+        String::from_utf8(s.unwrap()).unwrap()
     }
 
      /// If the Json value is an Object, returns the value associated with the provided key.
@@ -1728,14 +1726,14 @@ impl<T: Iterator<char>> Builder<T> {
 /// Decodes a json value from an `&mut io::Reader`
 pub fn from_reader(rdr: &mut io::Reader) -> Result<Json, BuilderError> {
     let contents = match rdr.read_to_end() {
-        Ok(c) => c,
+        Ok(c)  => c,
         Err(e) => return Err(io_error_to_error(e))
     };
-    let s = match str::from_utf8_owned(contents) {
-        Ok(s) => s,
-        _ => return Err(SyntaxError(NotUtf8, 0, 0))
+    let s = match str::from_utf8(contents.as_slice()) {
+        Some(s) => s,
+        _       => return Err(SyntaxError(NotUtf8, 0, 0))
     };
-    let mut builder = Builder::new(s.as_slice().chars());
+    let mut builder = Builder::new(s.chars());
     builder.build()
 }
 

trunk/src/libstd/ascii.rs

@@ -438,7 +438,7 @@ unsafe fn str_map_bytes(string: String, map: &'static [u8]) -> String {
         *b = map[*b as uint];
     }
 
-    String::from_str(str::from_utf8(bytes.as_slice()).unwrap())
+    String::from_utf8(bytes).unwrap()
 }
 
 #[inline]

trunk/src/libstd/fmt.rs

@@ -464,7 +464,7 @@ pub use core::fmt::{secret_pointer};
 pub fn format(args: &Arguments) -> string::String{
     let mut output = io::MemWriter::new();
     let _ = write!(&mut output, "{}", args);
-    str::from_utf8(output.unwrap().as_slice()).unwrap().into_string()
+    String::from_utf8(output.unwrap()).unwrap()
 }
 
 impl<'a> Writer for Formatter<'a> {

trunk/src/libstd/io/fs.rs

@@ -999,9 +999,9 @@ mod test {
             let mut read_buf = [0, .. 1028];
             let read_str = match check!(read_stream.read(read_buf)) {
                 -1|0 => fail!("shouldn't happen"),
-                n => str::from_utf8(read_buf.slice_to(n)).unwrap().to_owned()
+                n => str::from_utf8(read_buf.slice_to(n)).unwrap().to_string()
             };
-            assert_eq!(read_str, message.to_owned());
+            assert_eq!(read_str.as_slice(), message);
         }
         check!(unlink(filename));
     })