about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-03-23 15:26:24 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-03-23 15:26:24 -0700
commit6e0f1d3984b8cef2b27f029270f8bc18b87d14fc (patch)
tree00e7bbf019d9cc9096a7a6c580ca16a3306636d9
parent04e667a6b15bb83f16f03a0dd3c4b8612ba5c8b7 (diff)
parent959a0e69c9d2e4cabef77d97880dbeb2168f7f81 (diff)
downloadrust-6e0f1d3984b8cef2b27f029270f8bc18b87d14fc.tar.gz
rust-6e0f1d3984b8cef2b27f029270f8bc18b87d14fc.zip
rollup merge of #23484: alexcrichton/marker-trait-stable
This trait has proven quite useful when defining marker traits to avoid the
semi-confusing `PhantomFn` trait and it looks like it will continue to be a
useful tool for defining these traits.
-rw-r--r--src/libcore/marker.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs
index a2e7b717772..88c10e3661e 100644
--- a/src/libcore/marker.rs
+++ b/src/libcore/marker.rs
@@ -274,6 +274,7 @@ macro_rules! impls{
 /// any methods, but instead is used to gate access to data.
 ///
 /// FIXME. Better documentation needed here!
+#[stable(feature = "rust1", since = "1.0.0")]
 pub trait MarkerTrait : PhantomFn<Self,Self> { }
 //                                    ~~~~~ <-- FIXME(#22806)?
 //