diff options
| author | bors <bors@rust-lang.org> | 2015-04-03 19:53:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-04-03 19:53:27 +0000 |
| commit | c1b8eb5ad4e4b581a38dd7d94723497b568a60d4 (patch) | |
| tree | dcf0e93d1d4886c07d2ee48f12d5339bf31c0aca | |
| parent | 80def6c2447d23a624e611417f24cf0ab2a5a676 (diff) | |
| parent | 62b30605071698ca38baf103c4666c52b0b30fac (diff) | |
| download | rust-c1b8eb5ad4e4b581a38dd7d94723497b568a60d4.tar.gz rust-c1b8eb5ad4e4b581a38dd7d94723497b568a60d4.zip | |
Auto merge of #24018 - nikomatsakis:marker-trait-stability, r=alexcrichton
r? @alexcrichton
| -rw-r--r-- | src/libcore/marker.rs | 8 |
1 files 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=()> { |