From 62b30605071698ca38baf103c4666c52b0b30fac Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Fri, 3 Apr 2015 14:30:13 -0400
Subject: [PATCH] Revert accidental change from stable -> unstable; just meant
 to deprecate (though these will likely be purged for 1.0).

---
 src/libcore/marker.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs
index 352f7d86977..ad640c86285 100644
--- a/src/libcore/marker.rs
+++ b/src/libcore/marker.rs
@@ -273,14 +273,14 @@ macro_rules! impls{
 }
 
 /// `MarkerTrait` is deprecated and no longer needed.
-#[unstable(feature = "core", reason = "deprecated")]
+#[stable(feature = "rust1", since = "1.0.0")]
 #[deprecated(since = "1.0.0", reason = "No longer needed")]
 #[allow(deprecated)]
 #[cfg(stage0)]
 pub trait MarkerTrait : PhantomFn<Self,Self> { }
 
 /// `MarkerTrait` is deprecated and no longer needed.
-#[unstable(feature = "core", reason = "deprecated")]
+#[stable(feature = "rust1", since = "1.0.0")]
 #[deprecated(since = "1.0.0", reason = "No longer needed")]
 #[allow(deprecated)]
 #[cfg(not(stage0))]
@@ -291,14 +291,14 @@ impl<T:?Sized> MarkerTrait for T { }
 
 /// `PhantomFn` is a deprecated marker trait that is no longer needed.
 #[lang="phantom_fn"]
-#[unstable(feature = "core", reason = "deprecated")]
+#[stable(feature = "rust1", since = "1.0.0")]
 #[deprecated(since = "1.0.0", reason = "No longer needed")]
 #[cfg(stage0)]
 pub trait PhantomFn<A:?Sized,R:?Sized=()> {
 }
 
 /// `PhantomFn` is a deprecated marker trait that is no longer needed.
-#[unstable(feature = "core", reason = "deprecated")]
+#[stable(feature = "rust1", since = "1.0.0")]
 #[deprecated(since = "1.0.0", reason = "No longer needed")]
 #[cfg(not(stage0))]
 pub trait PhantomFn<A:?Sized,R:?Sized=()> {