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

rename std::sync::RWLockReadGuard to RwLockReadGuard

Browse Source
This commit is contained in:
ville-h
2015-01-04 11:43:14 +02:00
parent c3dcf9b6bf
commit 2dcbdc1eda
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,7 +110,7 @@ pub const RW_LOCK_INIT: StaticRwLock = StaticRwLock {
/// dropped. /// dropped.
#[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,
@@ -301,11 +301,11 @@ 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 {
__lock: lock, __lock: lock,
__data: data, __data: data,
__marker: marker::NoSend, __marker: marker::NoSend,
@@ -327,7 +327,7 @@ impl<'rwlock, T> RWLockWriteGuard<'rwlock, T> {
} }
} }
impl<'rwlock, T> Deref for RWLockReadGuard<'rwlock, T> { impl<'rwlock, T> Deref for RwLockReadGuard<'rwlock, T> {
type Target = T; type Target = T;
fn deref(&self) -> &T { unsafe { &*self.__data.get() } } fn deref(&self) -> &T { unsafe { &*self.__data.get() } }
@@ -344,7 +344,7 @@ impl<'rwlock, T> DerefMut for RWLockWriteGuard<'rwlock, T> {
} }
#[unsafe_destructor] #[unsafe_destructor]
impl<'a, T> Drop for RWLockReadGuard<'a, T> { impl<'a, T> Drop for RwLockReadGuard<'a, T> {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { self.__lock.lock.read_unlock(); } unsafe { self.__lock.lock.read_unlock(); }
} }