about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-02-24 04:42:09 +0000
committerbors <bors@rust-lang.org>2016-02-24 04:42:09 +0000
commit304c790fc28182d266ad7532b637975b3fb1d67f (patch)
treef7bbbc9bc37618bf6569f4e8ff4e805aa90a2883 /src/libstd/sync
parenta4574bd4a5e92400ef700cf69cab420b490b377a (diff)
parenta92ee0f664c84545c3cba70644472ec3df23c1ee (diff)
downloadrust-304c790fc28182d266ad7532b637975b3fb1d67f.tar.gz
rust-304c790fc28182d266ad7532b637975b3fb1d67f.zip
Auto merge of #31778 - aturon:snapshot, r=alexcrichton
r? @alexcrichton
Diffstat (limited to 'src/libstd/sync')
-rw-r--r--src/libstd/sync/mpsc/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs
index 9487295fd1a..fadca390986 100644
--- a/src/libstd/sync/mpsc/mod.rs
+++ b/src/libstd/sync/mpsc/mod.rs
@@ -385,12 +385,12 @@ pub enum TrySendError<T> {
     /// this is not a buffered channel, then there is no receiver available to
     /// acquire the data.
     #[stable(feature = "rust1", since = "1.0.0")]
-    Full(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] T),
+    Full(#[stable(feature = "rust1", since = "1.0.0")] T),
 
     /// This channel's receiving half has disconnected, so the data could not be
     /// sent. The data is returned back to the callee in this case.
     #[stable(feature = "rust1", since = "1.0.0")]
-    Disconnected(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] T),
+    Disconnected(#[stable(feature = "rust1", since = "1.0.0")] T),
 }
 
 enum Flavor<T> {