Skip to content

Commit c1b8eb5

Browse files
committed
Auto merge of #24018 - nikomatsakis:marker-trait-stability, r=alexcrichton
r? @alexcrichton
2 parents 80def6c + 62b3060 commit c1b8eb5

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/libcore/marker.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -273,14 +273,14 @@ macro_rules! impls{
273273
}
274274

275275
/// `MarkerTrait` is deprecated and no longer needed.
276-
#[unstable(feature = "core", reason = "deprecated")]
276+
#[stable(feature = "rust1", since = "1.0.0")]
277277
#[deprecated(since = "1.0.0", reason = "No longer needed")]
278278
#[allow(deprecated)]
279279
#[cfg(stage0)]
280280
pub trait MarkerTrait : PhantomFn<Self,Self> { }
281281

282282
/// `MarkerTrait` is deprecated and no longer needed.
283-
#[unstable(feature = "core", reason = "deprecated")]
283+
#[stable(feature = "rust1", since = "1.0.0")]
284284
#[deprecated(since = "1.0.0", reason = "No longer needed")]
285285
#[allow(deprecated)]
286286
#[cfg(not(stage0))]
@@ -291,14 +291,14 @@ impl<T:?Sized> MarkerTrait for T { }
291291

292292
/// `PhantomFn` is a deprecated marker trait that is no longer needed.
293293
#[lang="phantom_fn"]
294-
#[unstable(feature = "core", reason = "deprecated")]
294+
#[stable(feature = "rust1", since = "1.0.0")]
295295
#[deprecated(since = "1.0.0", reason = "No longer needed")]
296296
#[cfg(stage0)]
297297
pub trait PhantomFn<A:?Sized,R:?Sized=()> {
298298
}
299299

300300
/// `PhantomFn` is a deprecated marker trait that is no longer needed.
301-
#[unstable(feature = "core", reason = "deprecated")]
301+
#[stable(feature = "rust1", since = "1.0.0")]
302302
#[deprecated(since = "1.0.0", reason = "No longer needed")]
303303
#[cfg(not(stage0))]
304304
pub trait PhantomFn<A:?Sized,R:?Sized=()> {

0 commit comments

Comments
 (0)