---

yaml
---
r: 63275
b: refs/heads/snap-stage3
c: e650399
h: refs/heads/master
i:
  63273: 2e75ae1
  63271: d623075
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 9355330c1e8fa376ffb5ebee4aebed2c318d37d6
+refs/heads/snap-stage3: e6503995abafd30175fdf490a4c38f5187d64931
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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";

branches/snap-stage3/src/test/bench/shootout-fasta-redux.rs

@@ -93,7 +93,7 @@ impl RepeatFasta {
             let stdout = self.stdout;
             let alu_len = self.alu.len();
             let mut buf = vec::from_elem(alu_len + LINE_LEN, 0u8);
-            let alu: &[u8] = self.alu.as_bytes_with_null();
+            let alu: &[u8] = self.alu.as_bytes();
 
             copy_memory(buf, alu, alu_len);
             copy_memory(vec::mut_slice(buf, alu_len, buf.len()),

branches/snap-stage3/src/test/compile-fail/static-slice-not-null-terminated.rs

@@ -0,0 +1,21 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+fn main() {
+    let _ = (~"foo").as_bytes_with_null();
+    let _ = (@"foo").as_bytes_with_null();
+
+    // a plain static slice is null terminated, but such a slice can
+    // be sliced shorter (i.e. become non-null terminated) and still
+    // have the static lifetime
+    let foo: &'static str = "foo";
+    let _ = foo.as_bytes_with_null();
+     //~^ ERROR does not implement any method in scope named `as_bytes_with_null`
+}