Skip to content

Commit faf0500

Browse files
committed
---
yaml --- r: 169959 b: refs/heads/auto c: 2dcbdc1 h: refs/heads/master i: 169957: 57199de 169955: 6f40deb 169951: 3321db8 v: v3
1 parent 9d51e15 commit faf0500

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: c3dcf9b6bf7b3de4b7b4f51725f2ab814cbdfd38
13+
refs/heads/auto: 2dcbdc1edac50af0f1a2796b1dfe2dd082f8190c
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libstd/sync/rwlock.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ pub const RW_LOCK_INIT: StaticRwLock = StaticRwLock {
110110
/// dropped.
111111
#[must_use]
112112
#[stable]
113-
pub struct RWLockReadGuard<'a, T: 'a> {
113+
pub struct RwLockReadGuard<'a, T: 'a> {
114114
__lock: &'a StaticRwLock,
115115
__data: &'a UnsafeCell<T>,
116116
__marker: marker::NoSend,
@@ -301,11 +301,11 @@ impl StaticRwLock {
301301
}
302302
}
303303

304-
impl<'rwlock, T> RWLockReadGuard<'rwlock, T> {
304+
impl<'rwlock, T> RwLockReadGuard<'rwlock, T> {
305305
fn new(lock: &'rwlock StaticRwLock, data: &'rwlock UnsafeCell<T>)
306-
-> LockResult<RWLockReadGuard<'rwlock, T>> {
306+
-> LockResult<RwLockReadGuard<'rwlock, T>> {
307307
poison::map_result(lock.poison.borrow(), |_| {
308-
RWLockReadGuard {
308+
RwLockReadGuard {
309309
__lock: lock,
310310
__data: data,
311311
__marker: marker::NoSend,
@@ -327,7 +327,7 @@ impl<'rwlock, T> RWLockWriteGuard<'rwlock, T> {
327327
}
328328
}
329329

330-
impl<'rwlock, T> Deref for RWLockReadGuard<'rwlock, T> {
330+
impl<'rwlock, T> Deref for RwLockReadGuard<'rwlock, T> {
331331
type Target = T;
332332

333333
fn deref(&self) -> &T { unsafe { &*self.__data.get() } }
@@ -344,7 +344,7 @@ impl<'rwlock, T> DerefMut for RWLockWriteGuard<'rwlock, T> {
344344
}
345345

346346
#[unsafe_destructor]
347-
impl<'a, T> Drop for RWLockReadGuard<'a, T> {
347+
impl<'a, T> Drop for RwLockReadGuard<'a, T> {
348348
fn drop(&mut self) {
349349
unsafe { self.__lock.lock.read_unlock(); }
350350
}

0 commit comments

Comments
 (0)