OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix code and comments referencing StaticRwLock

This commit is contained in:
ville-h 2015-01-04 08:59:06 +02:00
parent fedbde6623
commit 817f75d2fb
2 changed files with 12 additions and 12 deletions
Show Stats 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, RWLOCK_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};

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

@ -60,7 +60,7 @@ use sys_common::rwlock as sys;
/// ``` /// ```
#[stable] #[stable]
pub struct RwLock<T> { pub struct RwLock<T> {
inner: Box<StaticRWLock>, inner: Box<StaticRwLock>,
data: UnsafeCell<T>, data: UnsafeCell<T>,
} }
@ -76,9 +76,9 @@ unsafe impl<T> Sync for RwLock<T> {}
/// # Example /// # Example
/// ///
/// ``` /// ```
/// use std::sync::{StaticRWLock, RWLOCK_INIT}; /// use std::sync::{StaticRwLock, RWLOCK_INIT};
/// ///
/// static LOCK: StaticRWLock = RWLOCK_INIT; /// static LOCK: StaticRwLock = RWLOCK_INIT;
/// ///
/// { /// {
/// let _g = LOCK.read().unwrap(); /// let _g = LOCK.read().unwrap();
@ -101,7 +101,7 @@ unsafe impl Sync for StaticRwLock {}
/// Constant initialization for a statically-initialized rwlock. /// Constant initialization for a statically-initialized rwlock.
#[unstable = "may be merged with RwLock in the future"] #[unstable = "may be merged with RwLock in the future"]
pub const RWLOCK_INIT: StaticRWLock = StaticRWLock { pub const RWLOCK_INIT: StaticRwLock = StaticRwLock {
lock: sys::RWLOCK_INIT, lock: sys::RWLOCK_INIT,
poison: poison::FLAG_INIT, poison: poison::FLAG_INIT,
}; };
@ -111,7 +111,7 @@ pub const RWLOCK_INIT: StaticRWLock = StaticRWLock {
#[must_use] #[must_use]
#[stable] #[stable]
pub struct RWLockReadGuard<'a, T: 'a> { pub struct RWLockReadGuard<'a, T: 'a> {
__lock: &'a StaticRWLock, __lock: &'a StaticRwLock,
__data: &'a UnsafeCell<T>, __data: &'a UnsafeCell<T>,
__marker: marker::NoSend, __marker: marker::NoSend,
} }
@ -121,7 +121,7 @@ pub struct RWLockReadGuard<'a, T: 'a> {
#[must_use] #[must_use]
#[stable] #[stable]
pub struct RWLockWriteGuard<'a, T: 'a> { pub struct RWLockWriteGuard<'a, T: 'a> {
__lock: &'a StaticRWLock, __lock: &'a StaticRwLock,
__data: &'a UnsafeCell<T>, __data: &'a UnsafeCell<T>,
__poison: poison::Guard, __poison: poison::Guard,
__marker: marker::NoSend, __marker: marker::NoSend,
@ -302,7 +302,7 @@ impl StaticRwLock {
} }
impl<'rwlock, T> RWLockReadGuard<'rwlock, T> { impl<'rwlock, T> RWLockReadGuard<'rwlock, T> {
fn new(lock: &'rwlock StaticRWLock, data: &'rwlock UnsafeCell<T>) fn new(lock: &'rwlock StaticRwLock, data: &'rwlock UnsafeCell<T>)
-> LockResult<RWLockReadGuard<'rwlock, T>> { -> LockResult<RWLockReadGuard<'rwlock, T>> {
poison::map_result(lock.poison.borrow(), |_| { poison::map_result(lock.poison.borrow(), |_| {
RWLockReadGuard { RWLockReadGuard {
@ -314,7 +314,7 @@ impl<'rwlock, T> RWLockReadGuard<'rwlock, T> {
} }
} }
impl<'rwlock, T> RWLockWriteGuard<'rwlock, T> { impl<'rwlock, T> RWLockWriteGuard<'rwlock, T> {
fn new(lock: &'rwlock StaticRWLock, data: &'rwlock UnsafeCell<T>) fn new(lock: &'rwlock StaticRwLock, data: &'rwlock UnsafeCell<T>)
-> LockResult<RWLockWriteGuard<'rwlock, T>> { -> LockResult<RWLockWriteGuard<'rwlock, T>> {
poison::map_result(lock.poison.borrow(), |guard| { poison::map_result(lock.poison.borrow(), |guard| {
RWLockWriteGuard { RWLockWriteGuard {
@ -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, RWLOCK_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 = RWLOCK_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 = RWLOCK_INIT;
static N: uint = 10; static N: uint = 10;
static M: uint = 1000; static M: uint = 1000;