diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-02 10:58:01 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-02 10:58:01 -0800 |
| commit | 902abab14475c4ed5885c1993492e89745edf0ad (patch) | |
| tree | e87f4e9c0a7bb599a073088abcb5ddaea09dae09 /src/libstd/sys/common | |
| parent | 7b185f9cda565945ae048c5567b1680670ff7482 (diff) | |
| parent | 70ed3a48dfa301c5bb56de3e0a7c25214539b83c (diff) | |
| download | rust-902abab14475c4ed5885c1993492e89745edf0ad.tar.gz rust-902abab14475c4ed5885c1993492e89745edf0ad.zip | |
rollup merge of #21787: alexcrichton/std-env
Conflicts: src/libstd/sys/unix/backtrace.rs src/libstd/sys/unix/os.rs
Diffstat (limited to 'src/libstd/sys/common')
| -rw-r--r-- | src/libstd/sys/common/mutex.rs | 7 | ||||
| -rw-r--r-- | src/libstd/sys/common/rwlock.rs | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/src/libstd/sys/common/mutex.rs b/src/libstd/sys/common/mutex.rs index 9aea0fb3b31..0ca22826700 100644 --- a/src/libstd/sys/common/mutex.rs +++ b/src/libstd/sys/common/mutex.rs @@ -24,13 +24,6 @@ unsafe impl Sync for Mutex {} pub const MUTEX_INIT: Mutex = Mutex(imp::MUTEX_INIT); impl Mutex { - /// Creates a newly initialized mutex. - /// - /// Behavior is undefined if the mutex is moved after the first method is - /// called on the mutex. - #[inline] - pub unsafe fn new() -> Mutex { Mutex(imp::Mutex::new()) } - /// Lock the mutex blocking the current thread until it is available. /// /// Behavior is undefined if the mutex has been moved between this and any diff --git a/src/libstd/sys/common/rwlock.rs b/src/libstd/sys/common/rwlock.rs index df016b9e293..fe374e1fd78 100644 --- a/src/libstd/sys/common/rwlock.rs +++ b/src/libstd/sys/common/rwlock.rs @@ -21,13 +21,6 @@ pub struct RWLock(imp::RWLock); pub const RWLOCK_INIT: RWLock = RWLock(imp::RWLOCK_INIT); impl RWLock { - /// Creates a new instance of an RWLock. - /// - /// Usage of an RWLock is undefined if it is moved after its first use (any - /// function calls below). - #[inline] - pub unsafe fn new() -> RWLock { RWLock(imp::RWLock::new()) } - /// Acquire shared access to the underlying lock, blocking the current /// thread to do so. /// |
