rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix code and comments referencing RW_LOCK_INIT

Browse Source
This commit is contained in:
ville-h
2015-01-04 10:57:05 +02:00
parent 5344ae2d4f
commit c3dcf9b6bf
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libstd/sync/mod.rs
View File

@@ -21,7 +21,7 @@ pub use alloc::arc::{Arc, Weak};
pub use self::mutex::{Mutex, MutexGuard, StaticMutex}; pub use self::mutex::{Mutex, MutexGuard, StaticMutex};
pub use self::mutex::MUTEX_INIT; pub use self::mutex::MUTEX_INIT;
pub use self::rwlock::{RwLock, StaticRwLock, RWLOCK_INIT}; pub use self::rwlock::{RwLock, StaticRwLock, RW_LOCK_INIT};
pub use self::rwlock::{RWLockReadGuard, RWLockWriteGuard}; pub use self::rwlock::{RWLockReadGuard, RWLockWriteGuard};
pub use self::condvar::{Condvar, StaticCondvar, CONDVAR_INIT}; pub use self::condvar::{Condvar, StaticCondvar, CONDVAR_INIT};
pub use self::once::{Once, ONCE_INIT}; pub use self::once::{Once, ONCE_INIT};

12
src/libstd/sync/rwlock.rs
View File

@@ -76,9 +76,9 @@ unsafe impl<T> Sync for RwLock<T> {}
/// # Example /// # Example
/// ///
/// ``` /// ```
/// use std::sync::{StaticRwLock, RWLOCK_INIT}; /// use std::sync::{StaticRwLock, RW_LOCK_INIT};
/// ///
/// static LOCK: StaticRwLock = RWLOCK_INIT; /// static LOCK: StaticRwLock = RW_LOCK_INIT;
/// ///
/// { /// {
/// let _g = LOCK.read().unwrap(); /// let _g = LOCK.read().unwrap();
@@ -131,7 +131,7 @@ impl<T: Send + Sync> RwLock<T> {
/// Creates a new instance of an RwLock which is unlocked and read to go. /// Creates a new instance of an RwLock which is unlocked and read to go.
#[stable] #[stable]
pub fn new(t: T) -> RwLock<T> { pub fn new(t: T) -> RwLock<T> {
RwLock { inner: box RWLOCK_INIT, data: UnsafeCell::new(t) } RwLock { inner: box RW_LOCK_INIT, data: UnsafeCell::new(t) }
} }
/// Locks this rwlock with shared read access, blocking the current thread /// Locks this rwlock with shared read access, blocking the current thread
@@ -365,7 +365,7 @@ mod tests {
use rand::{mod, Rng}; use rand::{mod, Rng};
use sync::mpsc::channel; use sync::mpsc::channel;
use thread::Thread; use thread::Thread;
use sync::{Arc, RwLock, StaticRwLock, RWLOCK_INIT}; use sync::{Arc, RwLock, StaticRwLock, RW_LOCK_INIT};
#[test] #[test]
fn smoke() { fn smoke() {
@@ -378,7 +378,7 @@ mod tests {
#[test] #[test]
fn static_smoke() { fn static_smoke() {
static R: StaticRwLock = RWLOCK_INIT; static R: StaticRwLock = RW_LOCK_INIT;
drop(R.read().unwrap()); drop(R.read().unwrap());
drop(R.write().unwrap()); drop(R.write().unwrap());
drop((R.read().unwrap(), R.read().unwrap())); drop((R.read().unwrap(), R.read().unwrap()));
@@ -388,7 +388,7 @@ mod tests {
#[test] #[test]
fn frob() { fn frob() {
static R: StaticRwLock = RWLOCK_INIT; static R: StaticRwLock = RW_LOCK_INIT;
static N: uint = 10; static N: uint = 10;
static M: uint = 1000; static M: uint = 1000;