summary refs log tree commit diff
path: root/src/libcore/str.rs
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/libcore/str.rs
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/libcore/str.rs')
-rw-r--r--src/libcore/str.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libcore/str.rs b/src/libcore/str.rs
index 1872d0ae674..cba9b11cb3d 100644
--- a/src/libcore/str.rs
+++ b/src/libcore/str.rs
@@ -12,7 +12,7 @@ export eq, lteq, hash, is_empty, is_not_empty, is_whitespace, byte_len,
        push_char, is_utf8, from_chars, to_chars, char_len, char_len_range,
        char_at, bytes, is_ascii, shift_byte, pop_byte,
        unsafe_from_byte, unsafe_from_bytes, from_char, char_range_at,
-       str_from_cstr, sbuf, as_buf, push_byte, utf8_char_width, safe_slice,
+       from_cstr, sbuf, as_buf, push_byte, utf8_char_width, safe_slice,
        contains, iter_chars, loop_chars, loop_chars_sub,
        escape;
 
@@ -973,11 +973,11 @@ fn as_buf<T>(s: str, f: block(sbuf) -> T) -> T unsafe {
 }
 
 /*
-Function: str_from_cstr
+Function: from_cstr
 
 Create a Rust string from a null-terminated C string
 */
-unsafe fn str_from_cstr(cstr: sbuf) -> str {
+unsafe fn from_cstr(cstr: sbuf) -> str {
     let res = "";
     let start = cstr;
     let curr = start;