Skip to content

Commit e5b401d

Browse files
committed
---
yaml --- r: 171315 b: refs/heads/batch c: 98e6d12 h: refs/heads/master i: 171313: 706c648 171311: d359437 v: v3
1 parent f62e9bd commit e5b401d

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
2929
refs/heads/issue-18208-method-dispatch-2: 9e1eae4fb9b6527315b4441cf8a0f5ca911d1671
3030
refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
32-
refs/heads/batch: 956cab6f97c1841e6f3f00acb6386f07eddfc25e
32+
refs/heads/batch: 98e6d12017da5e323612108c81accb1f437f7137
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
3434
refs/heads/beta: 496dc4eae7de9d14cd49511a9acfbf5f11ae6c3f
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ pub struct RwLockReadGuard<'a, T: 'a> {
120120
/// dropped.
121121
#[must_use]
122122
#[stable]
123-
pub struct RWLockWriteGuard<'a, T: 'a> {
123+
pub struct RwLockWriteGuard<'a, T: 'a> {
124124
__lock: &'a StaticRwLock,
125125
__data: &'a UnsafeCell<T>,
126126
__poison: poison::Guard,
@@ -313,11 +313,11 @@ impl<'rwlock, T> RwLockReadGuard<'rwlock, T> {
313313
})
314314
}
315315
}
316-
impl<'rwlock, T> RWLockWriteGuard<'rwlock, T> {
316+
impl<'rwlock, T> RwLockWriteGuard<'rwlock, T> {
317317
fn new(lock: &'rwlock StaticRwLock, data: &'rwlock UnsafeCell<T>)
318-
-> LockResult<RWLockWriteGuard<'rwlock, T>> {
318+
-> LockResult<RwLockWriteGuard<'rwlock, T>> {
319319
poison::map_result(lock.poison.borrow(), |guard| {
320-
RWLockWriteGuard {
320+
RwLockWriteGuard {
321321
__lock: lock,
322322
__data: data,
323323
__poison: guard,
@@ -332,12 +332,12 @@ impl<'rwlock, T> Deref for RwLockReadGuard<'rwlock, T> {
332332

333333
fn deref(&self) -> &T { unsafe { &*self.__data.get() } }
334334
}
335-
impl<'rwlock, T> Deref for RWLockWriteGuard<'rwlock, T> {
335+
impl<'rwlock, T> Deref for RwLockWriteGuard<'rwlock, T> {
336336
type Target = T;
337337

338338
fn deref(&self) -> &T { unsafe { &*self.__data.get() } }
339339
}
340-
impl<'rwlock, T> DerefMut for RWLockWriteGuard<'rwlock, T> {
340+
impl<'rwlock, T> DerefMut for RwLockWriteGuard<'rwlock, T> {
341341
fn deref_mut(&mut self) -> &mut T {
342342
unsafe { &mut *self.__data.get() }
343343
}
@@ -351,7 +351,7 @@ impl<'a, T> Drop for RwLockReadGuard<'a, T> {
351351
}
352352

353353
#[unsafe_destructor]
354-
impl<'a, T> Drop for RWLockWriteGuard<'a, T> {
354+
impl<'a, T> Drop for RwLockWriteGuard<'a, T> {
355355
fn drop(&mut self) {
356356
self.__lock.poison.done(&self.__poison);
357357
unsafe { self.__lock.lock.write_unlock(); }

0 commit comments

Comments
 (0)