Skip to content

Commit 347bd19

Browse files
committed
---
yaml --- r: 227607 b: refs/heads/try c: c032d6f h: refs/heads/master i: 227605: 7836c3e 227603: ae4466f 227599: 8861423 v: v3
1 parent 39ce534 commit 347bd19

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4-
refs/heads/try: 68b628b165c91e6abe1bccf9d94eb7c7ef7cdda3
4+
refs/heads/try: c032d6fd397d95ccfa7c9bbefc8cc508906b8d34
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/libstd/sync/mutex.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ impl<T: ?Sized> Mutex<T> {
238238
/// time. You should not trust a `false` value for program correctness
239239
/// without additional synchronization.
240240
#[inline]
241-
#[unstable(feature = "sync_poison")]
241+
#[stable(feature = "sync_poison", since = "1.2.0")]
242242
pub fn is_poisoned(&self) -> bool {
243243
self.inner.poison.get()
244244
}

branches/try/src/libstd/sync/rwlock.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ impl<T: ?Sized> RwLock<T> {
253253
/// time. You should not trust a `false` value for program correctness
254254
/// without additional synchronization.
255255
#[inline]
256-
#[unstable(feature = "sync_poison")]
256+
#[stable(feature = "sync_poison", since = "1.2.0")]
257257
pub fn is_poisoned(&self) -> bool {
258258
self.inner.poison.get()
259259
}

branches/try/src/libstd/sys/common/poison.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,24 +120,24 @@ impl<T: Send + Reflect> Error for PoisonError<T> {
120120

121121
impl<T> PoisonError<T> {
122122
/// Creates a `PoisonError`.
123-
#[unstable(feature = "sync_poison")]
123+
#[stable(feature = "sync_poison", since = "1.2.0")]
124124
pub fn new(guard: T) -> PoisonError<T> {
125125
PoisonError { guard: guard }
126126
}
127127

128128
/// Consumes this error indicating that a lock is poisoned, returning the
129129
/// underlying guard to allow access regardless.
130-
#[unstable(feature = "sync_poison")]
130+
#[stable(feature = "sync_poison", since = "1.2.0")]
131131
pub fn into_inner(self) -> T { self.guard }
132132

133133
/// Reaches into this error indicating that a lock is poisoned, returning a
134134
/// reference to the underlying guard to allow access regardless.
135-
#[unstable(feature = "sync_poison")]
135+
#[stable(feature = "sync_poison", since = "1.2.0")]
136136
pub fn get_ref(&self) -> &T { &self.guard }
137137

138138
/// Reaches into this error indicating that a lock is poisoned, returning a
139139
/// mutable reference to the underlying guard to allow access regardless.
140-
#[unstable(feature = "sync_poi")]
140+
#[stable(feature = "sync_poison", since = "1.2.0")]
141141
pub fn get_mut(&mut self) -> &mut T { &mut self.guard }
142142
}
143143

0 commit comments

Comments
 (0)