---

yaml
---
r: 64788
b: refs/heads/snap-stage3
c: 39b3a05
h: refs/heads/master
v: v3

Author: mstewartgallus

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: d0b7515aedcaa161bb206e651a374d7ff27e52a7
+refs/heads/snap-stage3: 39b3a0561f06b1ea01a12d8fc3372334116a7833
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libextra/arc.rs

@@ -182,11 +182,11 @@ impl<T:Send> MutexArc<T> {
      * Create a mutex-protected Arc with the supplied data and a specified number
      * of condvars (as sync::Mutex::new_with_condvars).
      */
-    pub fn new_with_condvars(user_data: T,
-                             num_condvars: uint) -> MutexArc<T> {
-        let data =
-            MutexArcInner { lock: Mutex::new_with_condvars(num_condvars),
-                           failed: false, data: user_data };
+    pub fn new_with_condvars(user_data: T, num_condvars: uint) -> MutexArc<T> {
+        let data = MutexArcInner {
+            lock: Mutex::new_with_condvars(num_condvars),
+            failed: false, data: user_data
+        };
         MutexArc { x: UnsafeAtomicRcBox::new(data) }
     }
 
@@ -333,9 +333,10 @@ impl<T:Freeze + Send> RWArc<T> {
      * of condvars (as sync::RWLock::new_with_condvars).
      */
     pub fn new_with_condvars(user_data: T, num_condvars: uint) -> RWArc<T> {
-        let data =
-            RWArcInner { lock: RWLock::new_with_condvars(num_condvars),
-                        failed: false, data: user_data };
+        let data = RWArcInner {
+            lock: RWLock::new_with_condvars(num_condvars),
+            failed: false, data: user_data
+        };
         RWArc { x: UnsafeAtomicRcBox::new(data), }
     }
 

branches/snap-stage3/src/libstd/unstable/sync.rs

@@ -236,13 +236,11 @@ impl<T> Drop for UnsafeAtomicRcBox<T>{
 
 /****************************************************************************/
 
-enum RTLittleLock {
-    // We know nothing about the runtime's representation of the
-    // little lock so we leave the definition empty.
-}
+#[allow(non_camel_case_types)] // runtime type
+type rust_little_lock = *libc::c_void;
 
 pub struct LittleLock {
-    l: *RTLittleLock,
+    l: rust_little_lock,
 }
 
 impl Drop for LittleLock {
@@ -351,10 +349,10 @@ impl<T:Send> Exclusive<T> {
 }
 
 extern {
-    fn rust_create_little_lock() -> *RTLittleLock;
-    fn rust_destroy_little_lock(lock: *RTLittleLock);
-    fn rust_lock_little_lock(lock: *RTLittleLock);
-    fn rust_unlock_little_lock(lock: *RTLittleLock);
+    fn rust_create_little_lock() -> rust_little_lock;
+    fn rust_destroy_little_lock(lock: rust_little_lock);
+    fn rust_lock_little_lock(lock: rust_little_lock);
+    fn rust_unlock_little_lock(lock: rust_little_lock);
 }
 
 #[cfg(test)]