about summary refs log tree commit diff
path: root/src/libcore/str
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2015-01-22 12:33:46 -0800
committerBrian Anderson <banderson@mozilla.com>2015-01-23 15:50:03 -0800
commit9758c488a94e77cc8a110a6783a99cf5b91326db (patch)
treeca5f2436cb4b9dc39aa7f525cf4a5fc9288d0ac7 /src/libcore/str
parentcd6d9eab5d75584edfcae4ffdef8b0836db80c1e (diff)
downloadrust-9758c488a94e77cc8a110a6783a99cf5b91326db.tar.gz
rust-9758c488a94e77cc8a110a6783a99cf5b91326db.zip
Deprecated attributes don't take 'feature' names and are paired with stable/unstable
Conflicts:
	src/libcore/atomic.rs
	src/libcore/finally.rs
	src/test/auxiliary/inherited_stability.rs
	src/test/auxiliary/lint_stability.rs
Diffstat (limited to 'src/libcore/str')
-rw-r--r--src/libcore/str/mod.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs
index 8daf71edb33..d487d135df4 100644
--- a/src/libcore/str/mod.rs
+++ b/src/libcore/str/mod.rs
@@ -195,7 +195,8 @@ pub unsafe fn from_utf8_unchecked<'a>(v: &'a [u8]) -> &'a str {
 /// # Panics
 ///
 /// This function will panic if the string pointed to by `s` is not valid UTF-8.
-#[deprecated(feature = "oldstuff", since = "1.0.0",
+#[unstable(feature = "core")]
+#[deprecated(since = "1.0.0",
              reason = "use std::ffi::c_str_to_bytes + str::from_utf8")]
 pub unsafe fn from_c_str(s: *const i8) -> &'static str {
     let s = s as *const u8;