Rename std::str::unsafe_from_bytes_ivec to unsafe_from_bytes

5 files changed, 12 insertions, 12 deletions

diff --git a/src/lib/extfmt.rs b/src/lib/extfmt.rs
index 295ae7fe110..8d191fb9cc3 100644
--- a/src/lib/extfmt.rs
+++ b/src/lib/extfmt.rs
@@ -358,7 +358,7 @@ mod rt {
     fn str_init_elt(c: char, n_elts: uint) -> str {
         let svec = ivec::from_vec(vec::init_elt[u8](c as u8, n_elts));
 
-        ret str::unsafe_from_bytes_ivec((svec));
+        ret str::unsafe_from_bytes((svec));
     }
     tag pad_mode { pad_signed; pad_unsigned; pad_nozero; }
     fn pad(cv: &conv, s: str, mode: pad_mode) -> str {
@@ -407,7 +407,7 @@ mod rt {
         if signed && zero_padding && str::byte_len(s) > 0u {
             let head = s.(0);
             if head == '+' as u8 || head == '-' as u8 || head == ' ' as u8 {
-                let headstr = str::unsafe_from_bytes_ivec(~[head]);
+                let headstr = str::unsafe_from_bytes(~[head]);
                 let bytelen = str::byte_len(s);
                 let numpart = str::substr(s, 1u, bytelen - 1u);
                 ret headstr + padstr + numpart;
diff --git a/src/lib/io.rs b/src/lib/io.rs
index 3407eba4875..645cc5b55f3 100644
--- a/src/lib/io.rs
+++ b/src/lib/io.rs
@@ -120,7 +120,7 @@ obj new_reader(rdr: buf_reader) {
                 go_on = false;
             } else { vec::push[u8](buf, ch as u8); }
         }
-        ret str::unsafe_from_bytes_ivec(ivec::from_vec(buf));
+        ret str::unsafe_from_bytes(ivec::from_vec(buf));
     }
     fn read_c_str() -> str {
         let buf: vec[u8] = [];
@@ -131,7 +131,7 @@ obj new_reader(rdr: buf_reader) {
                 go_on = false;
             } else { vec::push[u8](buf, ch as u8); }
         }
-        ret str::unsafe_from_bytes_ivec(ivec::from_vec(buf));
+        ret str::unsafe_from_bytes(ivec::from_vec(buf));
     }
 
     // FIXME deal with eof?
@@ -441,7 +441,7 @@ fn string_writer() -> str_writer {
     obj str_writer_wrap(wr: writer, buf: mutable_byte_buf) {
         fn get_writer() -> writer { ret wr; }
         fn get_str() -> str {
-            ret str::unsafe_from_bytes_ivec(ivec::from_vec(buf.buf));
+            ret str::unsafe_from_bytes(ivec::from_vec(buf.buf));
         }
     }
     ret str_writer_wrap(new_writer(byte_buf_writer(buf)), buf);
diff --git a/src/lib/ioivec.rs b/src/lib/ioivec.rs
index 6e42c1e8166..382e93479e1 100644
--- a/src/lib/ioivec.rs
+++ b/src/lib/ioivec.rs
@@ -121,7 +121,7 @@ obj new_reader(rdr: buf_reader) {
                 go_on = false;
             } else { buf += ~[ch as u8]; }
         }
-        ret str::unsafe_from_bytes_ivec(buf);
+        ret str::unsafe_from_bytes(buf);
     }
     fn read_c_str() -> str {
         let buf: [u8] = ~[];
@@ -130,7 +130,7 @@ obj new_reader(rdr: buf_reader) {
             let ch = rdr.read_byte();
             if ch < 1 { go_on = false; } else { buf += ~[ch as u8]; }
         }
-        ret str::unsafe_from_bytes_ivec(buf);
+        ret str::unsafe_from_bytes(buf);
     }
 
     // FIXME deal with eof?
@@ -435,7 +435,7 @@ fn string_writer() -> str_writer {
     let buf: mutable_byte_buf = @{mutable buf: b, mutable pos: 0u};
     obj str_writer_wrap(wr: writer, buf: mutable_byte_buf) {
         fn get_writer() -> writer { ret wr; }
-        fn get_str() -> str { ret str::unsafe_from_bytes_ivec(buf.buf); }
+        fn get_str() -> str { ret str::unsafe_from_bytes(buf.buf); }
     }
     ret str_writer_wrap(new_writer(byte_buf_writer(buf)), buf);
 }
@@ -456,7 +456,7 @@ fn seek_in_buf(offset: int, pos: uint, len: uint, whence: seek_style) ->
 }
 
 fn read_whole_file_str(file: &str) -> str {
-    str::unsafe_from_bytes_ivec(read_whole_file(file))
+    str::unsafe_from_bytes(read_whole_file(file))
 }
 
 fn read_whole_file(file: &str) -> [u8] {
diff --git a/src/lib/run_program.rs b/src/lib/run_program.rs
index 05e3ee3a1d9..b1cbcc24234 100644
--- a/src/lib/run_program.rs
+++ b/src/lib/run_program.rs
@@ -104,7 +104,7 @@ fn read_all(rd: &io::reader) -> str {
     let buf = "";
     while !rd.eof() {
         let bytes = ivec::from_vec(rd.read_bytes(4096u));
-        buf += str::unsafe_from_bytes_ivec(bytes);
+        buf += str::unsafe_from_bytes(bytes);
     }
     ret buf;
 }
diff --git a/src/lib/str.rs b/src/lib/str.rs
index d1f31f3d820..2f695b794be 100644
--- a/src/lib/str.rs
+++ b/src/lib/str.rs
@@ -48,7 +48,7 @@ export connect;
 export connect_ivec;
 export to_upper;
 export safe_slice;
-export unsafe_from_bytes_ivec;
+export unsafe_from_bytes;
 export is_empty;
 export is_not_empty;
 export is_whitespace;
@@ -192,7 +192,7 @@ fn bytes(s: str) -> [u8] {
     ret ivec::unsafe::from_buf(ptr, byte_len(s));
 }
 
-fn unsafe_from_bytes_ivec(v: &[mutable? u8]) -> str {
+fn unsafe_from_bytes(v: &[mutable? u8]) -> str {
     ret rustrt::str_from_ivec(v);
 }