From de39874801761197bf10bf8d04bde1aa2bd82e15 Mon Sep 17 00:00:00 2001 From: Florian Hahn Date: Thu, 5 Sep 2013 14:17:24 +0200 Subject: Rename str::from_bytes to str::from_utf8, closes #8985 --- src/libstd/num/int_macros.rs | 2 +- src/libstd/num/strconv.rs | 2 +- src/libstd/num/uint_macros.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libstd/num') diff --git a/src/libstd/num/int_macros.rs b/src/libstd/num/int_macros.rs index 0131feda830..377d0a78134 100644 --- a/src/libstd/num/int_macros.rs +++ b/src/libstd/num/int_macros.rs @@ -541,7 +541,7 @@ impl ToStrRadix for $T { } // We know we generated valid utf-8, so we don't need to go through that // check. - unsafe { str::raw::from_bytes_owned(buf) } + unsafe { str::raw::from_utf8_owned(buf) } } } diff --git a/src/libstd/num/strconv.rs b/src/libstd/num/strconv.rs index 6fba8a6dd13..edfabd339af 100644 --- a/src/libstd/num/strconv.rs +++ b/src/libstd/num/strconv.rs @@ -417,7 +417,7 @@ pub fn float_to_str_common (~str, bool) { let (bytes, special) = float_to_str_bytes_common(num, radix, negative_zero, sign, digits); - (str::from_bytes(bytes), special) + (str::from_utf8(bytes), special) } // Some constants for from_str_bytes_common's input validation, diff --git a/src/libstd/num/uint_macros.rs b/src/libstd/num/uint_macros.rs index 1426142d465..af991045b45 100644 --- a/src/libstd/num/uint_macros.rs +++ b/src/libstd/num/uint_macros.rs @@ -396,7 +396,7 @@ impl ToStrRadix for $T { } // We know we generated valid utf-8, so we don't need to go through that // check. - unsafe { str::raw::from_bytes_owned(buf) } + unsafe { str::raw::from_utf8_owned(buf) } } } -- cgit 1.4.1-3-g733a5