mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #24018 - nikomatsakis:marker-trait-stability, r=alexcrichton

Browse Source 
r? @alexcrichton
This commit is contained in:
bors 2015-04-03 19:53:27 +00:00
commit c1b8eb5ad4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libcore/marker.rs
View File

@ -273,14 +273,14 @@ macro_rules! impls{
} }
/// `MarkerTrait` is deprecated and no longer needed. /// `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")] #[deprecated(since = "1.0.0", reason = "No longer needed")]
#[allow(deprecated)] #[allow(deprecated)]
#[cfg(stage0)] #[cfg(stage0)]
pub trait MarkerTrait : PhantomFn<Self,Self> { } pub trait MarkerTrait : PhantomFn<Self,Self> { }
/// `MarkerTrait` is deprecated and no longer needed. /// `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")] #[deprecated(since = "1.0.0", reason = "No longer needed")]
#[allow(deprecated)] #[allow(deprecated)]
#[cfg(not(stage0))] #[cfg(not(stage0))]
@ -291,14 +291,14 @@ impl<T:?Sized> MarkerTrait for T { }
/// `PhantomFn` is a deprecated marker trait that is no longer needed. /// `PhantomFn` is a deprecated marker trait that is no longer needed.
#[lang="phantom_fn"] #[lang="phantom_fn"]
#[unstable(feature = "core", reason = "deprecated")] #[stable(feature = "rust1", since = "1.0.0")]
#[deprecated(since = "1.0.0", reason = "No longer needed")] #[deprecated(since = "1.0.0", reason = "No longer needed")]
#[cfg(stage0)] #[cfg(stage0)]
pub trait PhantomFn<A:?Sized,R:?Sized=()> { pub trait PhantomFn<A:?Sized,R:?Sized=()> {
} }
/// `PhantomFn` is a deprecated marker trait that is no longer needed. /// `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")] #[deprecated(since = "1.0.0", reason = "No longer needed")]
#[cfg(not(stage0))] #[cfg(not(stage0))]
pub trait PhantomFn<A:?Sized,R:?Sized=()> { pub trait PhantomFn<A:?Sized,R:?Sized=()> {