Rename std::str::unsafe_from_bytes_ivec to unsafe_from_bytes

Author: brson

src/comp/driver/rustc.rs

@@ -105,7 +105,7 @@ fn parse_input_src(sess: session::session, cfg: &ast::crate_cfg,
     } else {
         ioivec::stdin()
     }.read_whole_stream();
-    let src = str::unsafe_from_bytes_ivec(srcbytes);
+    let src = str::unsafe_from_bytes(srcbytes);
     let crate = parser::parse_crate_from_source_str(infile, src, cfg,
                                                     sess.get_parse_sess());
     ret {crate: crate, src: src};

src/comp/metadata/decoder.rs

@@ -85,7 +85,7 @@ fn item_family(item: &ebmlivec::doc) -> u8 {
 
 fn item_symbol(item: &ebmlivec::doc) -> str {
     let sym = ebmlivec::get_doc(item, tag_items_data_item_symbol);
-    ret str::unsafe_from_bytes_ivec(ebmlivec::doc_data(sym));
+    ret str::unsafe_from_bytes(ebmlivec::doc_data(sym));
 }
 
 fn variant_tag_id(d: &ebmlivec::doc) -> ast::def_id {
@@ -149,7 +149,7 @@ fn tag_variant_ids(item: &ebmlivec::doc, this_cnum: ast::crate_num) ->
 // definition the path refers to.
 fn resolve_path(path: &[ast::ident], data: @[u8]) -> [ast::def_id] {
     fn eq_item(data: &[u8], s: str) -> bool {
-        ret str::eq(str::unsafe_from_bytes_ivec(data), s);
+        ret str::eq(str::unsafe_from_bytes(data), s);
     }
     let s = str::connect_ivec(path, "::");
     let md = ebmlivec::new_doc(data);
@@ -270,7 +270,7 @@ fn read_path(d: &ebmlivec::doc) -> {path: str, pos: uint} {
     let desc = ebmlivec::doc_data(d);
     let pos = ebmlivec::be_uint_from_bytes(@desc, 0u, 4u);
     let pathbytes = ivec::slice[u8](desc, 4u, ivec::len[u8](desc));
-    let path = str::unsafe_from_bytes_ivec(pathbytes);
+    let path = str::unsafe_from_bytes(pathbytes);
     ret {path: path, pos: pos};
 }
 
@@ -299,23 +299,23 @@ fn get_meta_items(md: &ebmlivec::doc) -> [@ast::meta_item] {
     for each meta_item_doc: ebmlivec::doc  in
              ebmlivec::tagged_docs(md, tag_meta_item_word) {
         let nd = ebmlivec::get_doc(meta_item_doc, tag_meta_item_name);
-        let n = str::unsafe_from_bytes_ivec(ebmlivec::doc_data(nd));
+        let n = str::unsafe_from_bytes(ebmlivec::doc_data(nd));
         items += ~[attr::mk_word_item(n)];
     }
     for each meta_item_doc: ebmlivec::doc  in
              ebmlivec::tagged_docs(md, tag_meta_item_name_value) {
         let nd = ebmlivec::get_doc(meta_item_doc, tag_meta_item_name);
         let vd = ebmlivec::get_doc(meta_item_doc, tag_meta_item_value);
-        let n = str::unsafe_from_bytes_ivec(ebmlivec::doc_data(nd));
-        let v = str::unsafe_from_bytes_ivec(ebmlivec::doc_data(vd));
+        let n = str::unsafe_from_bytes(ebmlivec::doc_data(nd));
+        let v = str::unsafe_from_bytes(ebmlivec::doc_data(vd));
         // FIXME (#611): Should be able to decode meta_name_value variants,
         // but currently they can't be encoded
         items += ~[attr::mk_name_value_item_str(n, v)];
     }
     for each meta_item_doc: ebmlivec::doc  in
              ebmlivec::tagged_docs(md, tag_meta_item_list) {
         let nd = ebmlivec::get_doc(meta_item_doc, tag_meta_item_name);
-        let n = str::unsafe_from_bytes_ivec(ebmlivec::doc_data(nd));
+        let n = str::unsafe_from_bytes(ebmlivec::doc_data(nd));
         let subitems = get_meta_items(meta_item_doc);
         items += ~[attr::mk_list_item(n, subitems)];
     }
@@ -372,7 +372,7 @@ fn get_crate_deps(data: @[u8]) -> [crate_dep] {
     let crate_num = 1;
     for each depdoc: ebmlivec::doc  in
              ebmlivec::tagged_docs(depsdoc, tag_crate_dep) {
-        let depname = str::unsafe_from_bytes_ivec(ebmlivec::doc_data(depdoc));
+        let depname = str::unsafe_from_bytes(ebmlivec::doc_data(depdoc));
         deps += ~[{cnum: crate_num, ident: depname}];
         crate_num += 1;
     }

src/comp/middle/trans.rs

@@ -312,7 +312,7 @@ fn sanitize(s: &str) -> str {
                            c != ' ' as u8 && c != '\t' as u8 && c != ';' as u8
                        {
                         let v = ~[c];
-                        result += str::unsafe_from_bytes_ivec(v);
+                        result += str::unsafe_from_bytes(v);
                     }
                 }
             }

src/comp/syntax/parse/lexer.rs

@@ -177,11 +177,11 @@ fn scan_exponent(rdr: &reader) -> option::t[str] {
     let c = rdr.curr();
     let rslt = "";
     if c == 'e' || c == 'E' {
-        rslt += str::unsafe_from_bytes_ivec(~[c as u8]);
+        rslt += str::unsafe_from_bytes(~[c as u8]);
         rdr.bump();
         c = rdr.curr();
         if c == '-' || c == '+' {
-            rslt += str::unsafe_from_bytes_ivec(~[c as u8]);
+            rslt += str::unsafe_from_bytes(~[c as u8]);
             rdr.bump();
         }
         let exponent = scan_dec_digits(rdr);
@@ -195,7 +195,7 @@ fn scan_dec_digits(rdr: &reader) -> str {
     let c = rdr.curr();
     let rslt: str = "";
     while is_dec_digit(c) || c == '_' {
-        if c != '_' { rslt += str::unsafe_from_bytes_ivec(~[c as u8]); }
+        if c != '_' { rslt += str::unsafe_from_bytes(~[c as u8]); }
         rdr.bump();
         c = rdr.curr();
     }
@@ -711,7 +711,7 @@ type lit = {lit: str, pos: uint};
 fn gather_comments_and_literals(cm: &codemap::codemap, path: str,
                                 srdr: ioivec::reader) ->
    {cmnts: [cmnt], lits: [lit]} {
-    let src = str::unsafe_from_bytes_ivec(srdr.read_whole_stream());
+    let src = str::unsafe_from_bytes(srdr.read_whole_stream());
     let itr = @interner::mk[str](str::hash, str::eq);
     let rdr = new_reader(cm, src, codemap::new_filemap(path, 0u, 0u), itr);
     let comments: [cmnt] = ~[];

src/comp/syntax/print/pprust.rs

@@ -1386,7 +1386,7 @@ fn print_literal(s: &ps, lit: &@ast::lit) {
       }
       ast::lit_char(ch) {
         word(s.s, "'" + escape_str(
-            str::unsafe_from_bytes_ivec(~[ch as u8]), '\'') + "'");
+            str::unsafe_from_bytes(~[ch as u8]), '\'') + "'");
       }
       ast::lit_int(val) { word(s.s, int::str(val)); }
       ast::lit_uint(val) { word(s.s, uint::str(val) + "u"); }

src/comp/util/ppaux.rs

@@ -132,7 +132,7 @@ fn ty_to_str(cx: &ctxt, typ: &t) -> str {
       }
       ty_var(v) { s += "<T" + int::str(v) + ">"; }
       ty_param(id,_) {
-        s += "'" + str::unsafe_from_bytes_ivec(~[('a' as u8) + (id as u8)]);
+        s += "'" + str::unsafe_from_bytes(~[('a' as u8) + (id as u8)]);
       }
       _ { s += ty_to_short_str(cx, typ); }
     }

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;

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);

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] {

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;
 }

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);
 }
 

src/test/bench/task-perf-word-count.rs

@@ -191,7 +191,7 @@ mod map_reduce {
               }
               find_reducer(ki, cc) {
                 let c;
-                let k = str::unsafe_from_bytes_ivec(ki);
+                let k = str::unsafe_from_bytes(ki);
                 // log_err "finding reducer for " + k;
                 alt reducers.find(k) {
                   some(_c) {

src/test/compiletest/procsrv.rs

@@ -88,7 +88,7 @@ fn readclose(fd: int) -> str {
     let buf = "";
     while !reader.eof() {
         let bytes = ivec::from_vec(reader.read_bytes(4096u));
-        buf += str::unsafe_from_bytes_ivec(bytes);
+        buf += str::unsafe_from_bytes(bytes);
     }
     os::libc::fclose(file);
     ret buf;

src/test/stdtest/run.rs

@@ -60,7 +60,7 @@ fn test_pipes() {
         let buf = "";
         while !reader.eof() {
             let bytes = ivec::from_vec(reader.read_bytes(4096u));
-            buf += str::unsafe_from_bytes_ivec(bytes);
+            buf += str::unsafe_from_bytes(bytes);
         }
         os::libc::fclose(file);
         ret buf;

src/test/stdtest/vec_str_conversions.rs

@@ -10,7 +10,7 @@ fn test_simple() {
     let s1: str = "All mimsy were the borogoves";
 
     let v: [u8] = str::bytes(s1);
-    let s2: str = str::unsafe_from_bytes_ivec(v);
+    let s2: str = str::unsafe_from_bytes(v);
     let i: uint = 0u;
     let n1: uint = str::byte_len(s1);
     let n2: uint = ivec::len[u8](v);