---

yaml
---
r: 23513
b: refs/heads/master
c: edd6d9e
h: refs/heads/master
i:
  23511: f5f741e
v: v3

Author: bblum

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: cf1d2a7fef9a1962d9883eead2c67bfa391d8aae
+refs/heads/master: edd6d9ea37f55cce3298deb6ef271cb7d03a824a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libstd/arc.rs

@@ -10,15 +10,16 @@ import unsafe::{SharedMutableState, shared_mutable_state,
                 clone_shared_mutable_state, unwrap_shared_mutable_state,
                 get_shared_mutable_state, get_shared_immutable_state};
 import sync;
-import sync::{mutex, mutex_with_condvars, rwlock, rwlock_with_condvars};
+import sync::{Mutex,  mutex,  mutex_with_condvars,
+              RWlock, rwlock, rwlock_with_condvars};
 
 export arc, clone, get;
 export condvar, mutex_arc, mutex_arc_with_condvars, unwrap_mutex_arc;
 export rw_arc, rw_arc_with_condvars, rw_write_mode, rw_read_mode;
 export unwrap_rw_arc;
 
 /// As sync::condvar, a mechanism for unlock-and-descheduling and signalling.
-struct condvar { is_mutex: bool; failed: &mut bool; cond: &sync::condvar; }
+struct condvar { is_mutex: bool; failed: &mut bool; cond: &sync::Condvar; }
 
 impl &condvar {
     /// 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 {
  ****************************************************************************/
 
 #[doc(hidden)]
-struct mutex_arc_inner<T: send> { lock: mutex; failed: bool; data: T; }
+struct mutex_arc_inner<T: send> { lock: Mutex; failed: bool; data: T; }
 /// An ARC with mutable data protected by a blocking mutex.
 struct mutex_arc<T: send> { x: SharedMutableState<mutex_arc_inner<T>>; }
 
@@ -234,7 +235,7 @@ struct poison_on_fail {
  ****************************************************************************/
 
 #[doc(hidden)]
-struct rw_arc_inner<T: const send> { lock: rwlock; failed: bool; data: T; }
+struct rw_arc_inner<T: const send> { lock: RWlock; failed: bool; data: T; }
 /**
  * A dual-mode ARC protected by a reader-writer lock. The data can be accessed
  * 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 {
 // lock it. This wraps the unsafety, with the justification that the 'lock'
 // field is never overwritten; only 'failed' and 'data'.
 #[doc(hidden)]
-fn borrow_rwlock<T: const send>(state: &r/mut rw_arc_inner<T>) -> &r/rwlock {
+fn borrow_rwlock<T: const send>(state: &r/mut rw_arc_inner<T>) -> &r/RWlock {
     unsafe { unsafe::transmute_immut(&mut state.lock) }
 }
 
 // FIXME (#3154) ice with struct/&<T> prevents these from being structs.
 
 /// The "write permission" token used for rw_arc.write_downgrade().
 enum rw_write_mode<T: const send> =
-    (&mut T, sync::rwlock_write_mode, poison_on_fail);
+    (&mut T, sync::RWlockWriteMode, poison_on_fail);
 /// The "read permission" token used for rw_arc.write_downgrade().
-enum rw_read_mode<T:const send> = (&T, sync::rwlock_read_mode);
+enum rw_read_mode<T:const send> = (&T, sync::RWlockReadMode);
 
 impl<T: const send> &rw_write_mode<T> {
     /// Access the pre-downgrade rw_arc in write mode.

trunk/src/libstd/std.rc

@@ -50,6 +50,7 @@ mod cell;
 
 // Concurrency
 
+#[warn(non_camel_case_types)]
 mod sync;
 mod arc;
 mod comm;