---

yaml
---
r: 143321
b: refs/heads/try2
c: 39b3a05
h: refs/heads/master
i:
  143319: a65d2d5
v: v3

Author: mstewartgallus

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: d0b7515aedcaa161bb206e651a374d7ff27e52a7
+refs/heads/try2: 39b3a0561f06b1ea01a12d8fc3372334116a7833
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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/try2/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)]