Skip to content

Commit 810d128

Browse files
committed
---
yaml --- r: 168934 b: refs/heads/snap-stage3 c: 2dcbdc1 h: refs/heads/master v: v3
1 parent 1be3476 commit 810d128

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
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 5e21e17d9638d14af41e27e5ca9a21c8a1bc0170
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: c3dcf9b6bf7b3de4b7b4f51725f2ab814cbdfd38
4+
refs/heads/snap-stage3: 2dcbdc1edac50af0f1a2796b1dfe2dd082f8190c
55
refs/heads/try: 5204084bd2e46af7cc6e0147430e44dd0d657bbb
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/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)