Skip to content

std: remove the invalid NullTerminatedStr instance for &'static str. #7096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions src/libstd/str.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/test/bench/shootout-fasta-redux.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
Expand Down
21 changes: 21 additions & 0 deletions src/test/compile-fail/static-slice-not-null-terminated.rs
Original file line number Diff line number Diff line change
@@ -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`
}