@@ -10,15 +10,16 @@ import unsafe::{SharedMutableState, shared_mutable_state,
10
10
clone_shared_mutable_state, unwrap_shared_mutable_state,
11
11
get_shared_mutable_state, get_shared_immutable_state} ;
12
12
import sync;
13
- import sync:: { mutex, mutex_with_condvars, rwlock, rwlock_with_condvars} ;
13
+ import sync:: { Mutex , mutex, mutex_with_condvars,
14
+ RWlock , rwlock, rwlock_with_condvars} ;
14
15
15
16
export arc, clone, get;
16
17
export condvar, mutex_arc, mutex_arc_with_condvars, unwrap_mutex_arc;
17
18
export rw_arc, rw_arc_with_condvars, rw_write_mode, rw_read_mode;
18
19
export unwrap_rw_arc;
19
20
20
21
/// As sync::condvar, a mechanism for unlock-and-descheduling and signalling.
21
- struct condvar { is_mutex : bool ; failed: & mut bool; cond: & sync:: condvar ; }
22
+ struct condvar { is_mutex : bool ; failed: & mut bool; cond: & sync:: Condvar ; }
22
23
23
24
impl & condvar {
24
25
/// Atomically exit the associated ARC and block until a signal is sent.
@@ -113,7 +114,7 @@ fn unwrap<T: const send>(+rc: arc<T>) -> T {
113
114
****************************************************************************/
114
115
115
116
#[ doc( hidden) ]
116
- struct mutex_arc_inner < T : send > { lock : mutex ; failed: bool ; data: T ; }
117
+ struct mutex_arc_inner < T : send > { lock : Mutex ; failed: bool ; data: T ; }
117
118
/// An ARC with mutable data protected by a blocking mutex.
118
119
struct mutex_arc < T : send > { x : SharedMutableState < mutex_arc_inner < T > > ; }
119
120
@@ -234,7 +235,7 @@ struct poison_on_fail {
234
235
****************************************************************************/
235
236
236
237
#[doc(hidden)]
237
- struct rw_arc_inner<T: const send> { lock: rwlock ; failed: bool; data: T; }
238
+ struct rw_arc_inner<T: const send> { lock: RWlock ; failed: bool; data: T; }
238
239
/**
239
240
* A dual-mode ARC protected by a reader-writer lock. The data can be accessed
240
241
* mutably or immutably, and immutably-accessing tasks may run concurrently.
@@ -383,17 +384,17 @@ fn unwrap_rw_arc<T: const send>(+arc: rw_arc<T>) -> T {
383
384
// lock it. This wraps the unsafety, with the justification that the 'lock'
384
385
// field is never overwritten; only 'failed' and 'data'.
385
386
#[doc(hidden)]
386
- fn borrow_rwlock<T: const send>(state: &r/mut rw_arc_inner<T>) -> &r/rwlock {
387
+ fn borrow_rwlock<T: const send>(state: &r/mut rw_arc_inner<T>) -> &r/RWlock {
387
388
unsafe { unsafe::transmute_immut(&mut state.lock) }
388
389
}
389
390
390
391
// FIXME (#3154) ice with struct/&<T> prevents these from being structs.
391
392
392
393
/// The " write permission" token used for rw_arc. write_downgrade ( ) .
393
394
enum rw_write_mode <T : const send> =
394
- ( & mut T , sync:: rwlock_write_mode , poison_on_fail) ;
395
+ ( & mut T , sync:: RWlockWriteMode , poison_on_fail) ;
395
396
/// The "read permission" token used for rw_arc.write_downgrade().
396
- enum rw_read_mode< T : const send > = ( & T , sync:: rwlock_read_mode ) ;
397
+ enum rw_read_mode< T : const send > = ( & T , sync:: RWlockReadMode ) ;
397
398
398
399
impl < T : const send > & rw_write_mode < T > {
399
400
/// Access the pre-downgrade rw_arc in write mode.
0 commit comments