From abadece3ba2dba032fa7752e88fcf58289c240ac Mon Sep 17 00:00:00 2001 From: Huon Wilson Date: Thu, 13 Jun 2013 13:28:24 +1000 Subject: std: remove the invalid NullTerminatedStr instance for &'static str. A slice of a 'static str is still 'static, but doesn't necessarily have the null terminator. --- src/libstd/str.rs | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'src/libstd') diff --git a/src/libstd/str.rs b/src/libstd/str.rs index c928933f4a7..164c57d9645 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -1953,18 +1953,6 @@ impl NullTerminatedStr for @str { slice } } -// static strings are the only slices guaranteed to a nul-terminator -impl NullTerminatedStr for &'static str { - /** - * Work with the byte buffer of a string as a byte slice. - * - * The byte slice does include the null terminator. - */ - #[inline] - fn as_bytes_with_null(&self) -> &'static [u8] { - unsafe { ::cast::transmute(*self) } - } -} #[allow(missing_doc)] pub trait OwnedStr { @@ -2925,10 +2913,6 @@ mod tests { 109, 0 ]; - assert_eq!("".as_bytes_with_null(), &[0]); - assert_eq!("abc".as_bytes_with_null(), &['a' as u8, 'b' as u8, 'c' as u8, 0]); - assert_eq!("ศไทย中华Việt Nam".as_bytes_with_null(), v); - let s1 = @""; let s2 = @"abc"; let s3 = @"ศไทย中华Việt Nam"; -- cgit 1.4.1-3-g733a5