diff options
| author | bors <bors@rust-lang.org> | 2016-01-15 15:39:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-01-15 15:39:39 +0000 |
| commit | e51661b888de8885732d33e9e17b5bc95b778729 (patch) | |
| tree | 080affcc39e2de75f7a0e337b87745fcbd1419c8 /src/libstd/sys | |
| parent | 1f4e317e45349eb2d3c853e96bfd24dd574b36d1 (diff) | |
| parent | 8ea7b88c9b8de8d750b42ceb46b3ec667e21e881 (diff) | |
| download | rust-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/sys')
| -rw-r--r-- | src/libstd/sys/common/poison.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/common/poison.rs b/src/libstd/sys/common/poison.rs index 446a4445b2d..2cfa04c843b 100644 --- a/src/libstd/sys/common/poison.rs +++ b/src/libstd/sys/common/poison.rs @@ -71,7 +71,7 @@ pub enum TryLockError<T> { /// The lock could not be acquired because another thread failed while holding /// the lock. #[stable(feature = "rust1", since = "1.0.0")] - Poisoned(PoisonError<T>), + Poisoned(#[cfg_attr(not(stage0), stable(feature = "rust1", since = "1.0.0"))] PoisonError<T>), /// The lock could not be acquired at this time because the operation would /// otherwise block. #[stable(feature = "rust1", since = "1.0.0")] |