about summary refs log tree commit diff
path: root/src/libstd/sync
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-01-15 15:39:39 +0000
committerbors <bors@rust-lang.org>2016-01-15 15:39:39 +0000
commite51661b888de8885732d33e9e17b5bc95b778729 (patch)
tree080affcc39e2de75f7a0e337b87745fcbd1419c8 /src/libstd/sync
parent1f4e317e45349eb2d3c853e96bfd24dd574b36d1 (diff)
parent8ea7b88c9b8de8d750b42ceb46b3ec667e21e881 (diff)
downloadrust-e51661b888de8885732d33e9e17b5bc95b778729.tar.gz
rust-e51661b888de8885732d33e9e17b5bc95b778729.zip
Auto merge of #30898 - petrochenkov:tvarfstab, r=alexcrichton
This wasn't done in https://github.com/rust-lang/rust/pull/29083 because attributes weren't parsed on fields of tuple variant back then.

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 e87ae19c583..3eb5db09bc0 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(T),
+    Full(#[cfg_attr(not(stage0), 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(T),
+    Disconnected(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] T),
 }
 
 enum Flavor<T> {