From d1ffe5034b341a9a522c01705cafdb19bac9cedb Mon Sep 17 00:00:00 2001 From: Lenny222 Date: Tue, 3 Jan 2012 19:08:13 +0100 Subject: "str": rename "str_from_cstr" to "from_cstr" (analogous to the other "from_*") --- src/libcore/str.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libcore/str.rs') 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(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; -- cgit 1.4.1-3-g733a5