Rename str::bytes to str::to_bytes

Closes #3245

8 files changed, 19 insertions, 19 deletions

diff --git a/src/libstd/base64.rs b/src/libstd/base64.rs
index 99e83d11e52..e990b5f5e50 100644
--- a/src/libstd/base64.rs
+++ b/src/libstd/base64.rs
@@ -57,7 +57,7 @@ impl ~[u8]: to_base64 {
 
 impl ~str: to_base64 {
     fn to_base64() -> ~str {
-        str::bytes(self).to_base64()
+        str::to_bytes(self).to_base64()
     }
 }
 
@@ -129,7 +129,7 @@ impl ~[u8]: from_base64 {
 
 impl ~str: from_base64 {
     fn from_base64() -> ~[u8] {
-        str::bytes(self).from_base64()
+        str::to_bytes(self).from_base64()
     }
 }
 
@@ -148,12 +148,12 @@ mod tests {
 
     #[test]
     fn test_from_base64() {
-        assert (~"").from_base64() == str::bytes(~"");
-        assert (~"Zg==").from_base64() == str::bytes(~"f");
-        assert (~"Zm8=").from_base64() == str::bytes(~"fo");
-        assert (~"Zm9v").from_base64() == str::bytes(~"foo");
-        assert (~"Zm9vYg==").from_base64() == str::bytes(~"foob");
-        assert (~"Zm9vYmE=").from_base64() == str::bytes(~"fooba");
-        assert (~"Zm9vYmFy").from_base64() == str::bytes(~"foobar");
+        assert (~"").from_base64() == str::to_bytes(~"");
+        assert (~"Zg==").from_base64() == str::to_bytes(~"f");
+        assert (~"Zm8=").from_base64() == str::to_bytes(~"fo");
+        assert (~"Zm9v").from_base64() == str::to_bytes(~"foo");
+        assert (~"Zm9vYg==").from_base64() == str::to_bytes(~"foob");
+        assert (~"Zm9vYmE=").from_base64() == str::to_bytes(~"fooba");
+        assert (~"Zm9vYmFy").from_base64() == str::to_bytes(~"foobar");
     }
 }
diff --git a/src/libstd/ebml.rs b/src/libstd/ebml.rs
index 758dcf4eebf..04efe4aa745 100644
--- a/src/libstd/ebml.rs
+++ b/src/libstd/ebml.rs
@@ -295,7 +295,7 @@ impl writer {
 
     fn wr_str(s: ~str) {
         debug!("Write str: %?", s);
-        self.writer.write(str::bytes(s));
+        self.writer.write(str::to_bytes(s));
     }
 }
 
diff --git a/src/libstd/md4.rs b/src/libstd/md4.rs
index 2c22d18440a..48601fc7585 100644
--- a/src/libstd/md4.rs
+++ b/src/libstd/md4.rs
@@ -100,7 +100,7 @@ fn md4_str(msg: ~[u8]) -> ~str {
     result
 }
 
-fn md4_text(msg: ~str) -> ~str { md4_str(str::bytes(msg)) }
+fn md4_text(msg: ~str) -> ~str { md4_str(str::to_bytes(msg)) }
 
 #[test]
 fn test_md4() {
diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs
index 64271eceed7..d1cbe221ed3 100644
--- a/src/libstd/net_tcp.rs
+++ b/src/libstd/net_tcp.rs
@@ -1523,7 +1523,7 @@ mod test {
                             server_ch.send(
                                 str::from_bytes(data));
                             log(debug, ~"SERVER: before write");
-                            tcp_write_single(sock, str::bytes(resp));
+                            tcp_write_single(sock, str::to_bytes(resp));
                             log(debug, ~"SERVER: after write.. die");
                             core::comm::send(kill_ch, none);
                           }
@@ -1599,7 +1599,7 @@ mod test {
         }
         else {
             let sock = result::unwrap(connect_result);
-            let resp_bytes = str::bytes(resp);
+            let resp_bytes = str::to_bytes(resp);
             tcp_write_single(sock, resp_bytes);
             let read_result = sock.read(0u);
             if read_result.is_err() {
diff --git a/src/libstd/net_url.rs b/src/libstd/net_url.rs
index 0c8d974a6d7..9bc6a0aab3a 100644
--- a/src/libstd/net_url.rs
+++ b/src/libstd/net_url.rs
@@ -1029,7 +1029,7 @@ mod tests {
 
         assert decode_form_urlencoded(~[]) == str_hash();
 
-        let s = str::bytes(~"a=1&foo+bar=abc&foo+bar=12+%3D+34");
+        let s = str::to_bytes(~"a=1&foo+bar=abc&foo+bar=12+%3D+34");
         assert decode_form_urlencoded(s) == hash_from_strs(~[
             (~"a", @dvec::from_elem(@~"1")),
             (~"foo bar", @dvec::from_vec(~[mut @~"abc", @~"12 = 34"]))
diff --git a/src/libstd/sha1.rs b/src/libstd/sha1.rs
index 16c992a97fe..508bdaa86f0 100644
--- a/src/libstd/sha1.rs
+++ b/src/libstd/sha1.rs
@@ -228,7 +228,7 @@ fn sha1() -> sha1 {
             self.computed = false;
         }
         fn input(msg: ~[u8]) { add_input(self, msg); }
-        fn input_str(msg: ~str) { add_input(self, str::bytes(msg)); }
+        fn input_str(msg: ~str) { add_input(self, str::to_bytes(msg)); }
         fn result() -> ~[u8] { return mk_result(self); }
         fn result_str() -> ~str {
             let r = mk_result(self);
diff --git a/src/libstd/treemap.rs b/src/libstd/treemap.rs
index 65dbadb4a53..2ca7202dff6 100644
--- a/src/libstd/treemap.rs
+++ b/src/libstd/treemap.rs
@@ -132,8 +132,8 @@ mod tests {
     fn u8_map() {
         let m = treemap();
 
-        let k1 = str::bytes(~"foo");
-        let k2 = str::bytes(~"bar");
+        let k1 = str::to_bytes(~"foo");
+        let k2 = str::to_bytes(~"bar");
 
         insert(m, k1, ~"foo");
         insert(m, k2, ~"bar");
diff --git a/src/libstd/uv_ll.rs b/src/libstd/uv_ll.rs
index 79a2856a1c7..c45b49849bc 100644
--- a/src/libstd/uv_ll.rs
+++ b/src/libstd/uv_ll.rs
@@ -1119,7 +1119,7 @@ mod test {
         // In C, this would be a malloc'd or stack-allocated
         // struct that we'd cast to a void* and store as the
         // data field in our uv_connect_t struct
-        let req_str_bytes = str::bytes(req_str);
+        let req_str_bytes = str::to_bytes(req_str);
         let req_msg_ptr: *u8 = vec::unsafe::to_ptr(req_str_bytes);
         log(debug, fmt!("req_msg ptr: %u", req_msg_ptr as uint));
         let req_msg = ~[
@@ -1367,7 +1367,7 @@ mod test {
         let server_write_req = write_t();
         let server_write_req_ptr = ptr::addr_of(server_write_req);
 
-        let resp_str_bytes = str::bytes(server_resp_msg);
+        let resp_str_bytes = str::to_bytes(server_resp_msg);
         let resp_msg_ptr: *u8 = vec::unsafe::to_ptr(resp_str_bytes);
         log(debug, fmt!("resp_msg ptr: %u", resp_msg_ptr as uint));
         let resp_msg = ~[