Skip to content

Commit d7ca36f

Browse files
committed
---
yaml --- r: 171931 b: refs/heads/beta c: 177f8bc h: refs/heads/master i: 171929: 4617bd6 171927: 91d65a8 v: v3
1 parent 7e45249 commit d7ca36f

File tree

5 files changed

+8
-19
lines changed

5 files changed

+8
-19
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b5571ed71a5879c0495a982506258d5d267744ed
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: 267b73d95e4fcc906e1b1207ab610fa45f6e6613
34+
refs/heads/beta: 177f8bc55c544d5a5f35ffb19f47125d001e48c4
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928

branches/beta/src/libcore/atomic.rs

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -146,28 +146,18 @@ pub enum Ordering {
146146
}
147147

148148
/// An `AtomicBool` initialized to `false`.
149-
#[unstable = "may be renamed, pending conventions for static initalizers"]
149+
#[stable]
150150
pub const ATOMIC_BOOL_INIT: AtomicBool =
151151
AtomicBool { v: UnsafeCell { value: 0 } };
152152
/// An `AtomicInt` initialized to `0`.
153-
#[unstable = "may be renamed, pending conventions for static initalizers"]
153+
#[stable]
154154
pub const ATOMIC_INT_INIT: AtomicInt =
155155
AtomicInt { v: UnsafeCell { value: 0 } };
156156
/// An `AtomicUint` initialized to `0`.
157-
#[unstable = "may be renamed, pending conventions for static initalizers"]
157+
#[stable]
158158
pub const ATOMIC_UINT_INIT: AtomicUint =
159159
AtomicUint { v: UnsafeCell { value: 0, } };
160160

161-
/// Deprecated
162-
#[deprecated = "renamed to ATOMIC_BOOL_INIT"]
163-
pub const INIT_ATOMIC_BOOL: AtomicBool = ATOMIC_BOOL_INIT;
164-
/// Deprecated
165-
#[deprecated = "renamed to ATOMIC_INT_INIT"]
166-
pub const INIT_ATOMIC_INT: AtomicInt = ATOMIC_INT_INIT;
167-
/// Deprecated
168-
#[deprecated = "renamed to ATOMIC_UINT_INIT"]
169-
pub const INIT_ATOMIC_UINT: AtomicUint = ATOMIC_UINT_INIT;
170-
171161
// NB: Needs to be -1 (0b11111111...) to make fetch_nand work correctly
172162
const UINT_TRUE: uint = -1;
173163

branches/beta/src/libstd/sync/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
//! and/or blocking at all, but rather provide the necessary tools to build
1616
//! other types of concurrent primitives.
1717
18-
#![experimental]
18+
#![stable]
1919

2020
pub use alloc::arc::{Arc, Weak};
2121
pub use core::atomic;

branches/beta/src/libstd/sync/mpsc/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,8 @@
163163
//! }
164164
//! ```
165165
166+
#![stable]
167+
166168
// A description of how Rust's channel implementation works
167169
//
168170
// Channels are supposed to be the basic building block for all other
@@ -565,6 +567,7 @@ impl<T: Send> Sender<T> {
565567
/// drop(rx);
566568
/// assert_eq!(tx.send(1i).err().unwrap().0, 1);
567569
/// ```
570+
#[stable]
568571
pub fn send(&self, t: T) -> Result<(), SendError<T>> {
569572
let (new_inner, ret) = match *unsafe { self.inner() } {
570573
Flavor::Oneshot(ref p) => {

branches/beta/src/libstd/sync/once.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,6 @@ impl Once {
121121
unsafe { self.mutex.destroy() }
122122
}
123123
}
124-
125-
/// Deprecated
126-
#[deprecated = "renamed to `call_once`"]
127-
pub fn doit<F>(&'static self, f: F) where F: FnOnce() { self.call_once(f) }
128124
}
129125

130126
#[cfg(test)]

0 commit comments

Comments
 (0)