diff options
| -rw-r--r-- | src/libcollections/string.rs | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs index beb12ff58af..98225dd3dda 100644 --- a/src/libcollections/string.rs +++ b/src/libcollections/string.rs @@ -66,7 +66,7 @@ use core::str::pattern::Pattern; use rustc_unicode::char::{decode_utf16, REPLACEMENT_CHARACTER}; use rustc_unicode::str as unicode_str; -use borrow::Cow; +use borrow::{Cow, ToOwned}; use range::RangeArgument; use str::{self, FromStr, Utf8Error, Chars}; use vec::Vec; @@ -1797,20 +1797,8 @@ impl AsRef<[u8]> for String { #[stable(feature = "rust1", since = "1.0.0")] impl<'a> From<&'a str> for String { - #[cfg(not(test))] - #[inline] fn from(s: &'a str) -> String { - String { vec: <[_]>::to_vec(s.as_bytes()) } - } - - // HACK(japaric): with cfg(test) the inherent `[T]::to_vec` method, which is - // required for this method definition, is not available. Since we don't - // require this method for testing purposes, I'll just stub it - // NB see the slice::hack module in slice.rs for more information - #[inline] - #[cfg(test)] - fn from(_: &str) -> String { - panic!("not available with cfg(test)"); + s.to_owned() } } |