about summary refs log tree commit diff
path: root/src/test/stdtest
diff options
context:
space:
mode:
authorLenny222 <github@kudling.de>2012-01-03 19:08:13 +0100
committerMarijn Haverbeke <marijnh@gmail.com>2012-01-04 09:33:07 +0100
commitd1ffe5034b341a9a522c01705cafdb19bac9cedb (patch)
tree3f9a1b4110b5010e7c6e8d82d38e642831be989f /src/test/stdtest
parentdd284eb396d802646106bdb15f474ebc10a9dfbb (diff)
downloadrust-d1ffe5034b341a9a522c01705cafdb19bac9cedb.tar.gz
rust-d1ffe5034b341a9a522c01705cafdb19bac9cedb.zip
"str": rename "str_from_cstr" to "from_cstr" (analogous to the other "from_*")
Diffstat (limited to 'src/test/stdtest')
-rw-r--r--src/test/stdtest/str.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/stdtest/str.rs b/src/test/stdtest/str.rs
index c3f0e53bac5..39217fb8a8b 100644
--- a/src/test/stdtest/str.rs
+++ b/src/test/stdtest/str.rs
@@ -287,10 +287,10 @@ fn unsafe_from_bytes() {
 }
 
 #[test]
-fn str_from_cstr() unsafe {
+fn from_cstr() unsafe {
     let a = [65u8, 65u8, 65u8, 65u8, 65u8, 65u8, 65u8, 0u8];
     let b = vec::to_ptr(a);
-    let c = str::str_from_cstr(b);
+    let c = str::from_cstr(b);
     assert (c == "AAAAAAA");
 }
 
@@ -312,7 +312,7 @@ fn as_buf_small() unsafe {
 fn as_buf2() unsafe {
     let s = "hello";
     let sb = str::as_buf(s, {|b| b });
-    let s_cstr = str::str_from_cstr(sb);
+    let s_cstr = str::from_cstr(sb);
     assert (str::eq(s_cstr, s));
 }