auto merge of #7096 : huonw/rust/invalid-null-str, r=thestinger

A slice of a 'static str is still 'static, but doesn't necessarily
have the null terminator.

1 files changed, 0 insertions, 16 deletions

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";