---

yaml
---
r: 24569
b: refs/heads/try2
c: 5bfb5ca
h: refs/heads/master
i:
  24567: 95547c2
v: v3

Author: eholk

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 27cecbf1cf4f87b12b43dd9ae253c20598858ced
+refs/heads/try2: 5bfb5cad3a8d5f9c1819472bcd166f8ed8972b6d
 refs/heads/incoming: 05543fd04dfb3f63b453a331e239ceb1a9a219f9
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libcore/arc.rs

@@ -88,7 +88,7 @@ type ex_data<T: send> = {lock: sys::lock_and_signal, data: T};
 type exclusive<T: send> = arc_destruct<ex_data<T>>;
 
 fn exclusive<T:send >(-data: T) -> exclusive<T> {
-    let data = ~{mut count: 1, data: {lock: sys::create_lock(),
+    let data = ~{mut count: 1, data: {lock: sys::lock_and_signal(),
                                       data: data}};
     unsafe {
         let ptr = unsafe::reinterpret_cast(data);

branches/try2/src/libcore/sys.rs

@@ -7,7 +7,7 @@ export min_align_of;
 export pref_align_of;
 export refcount;
 export log_str;
-export create_lock, lock_and_signal, condition, methods;
+export lock_and_signal, condition, methods;
 
 enum type_desc = {
     first_param: **libc::c_int,
@@ -87,7 +87,9 @@ pure fn log_str<T>(t: T) -> str {
 
 class lock_and_signal {
     let lock: rust_cond_lock;
-    new(lock: rust_cond_lock) { self.lock = lock; }
+    new() {
+        self.lock = rustrt::rust_create_cond_lock();
+    }
     drop { rustrt::rust_destroy_cond_lock(self.lock); }
 }
 
@@ -101,10 +103,6 @@ class unlock {
     drop { rustrt::rust_unlock_cond_lock(self.lock); }
 }
 
-fn create_lock() -> lock_and_signal {
-    lock_and_signal(rustrt::rust_create_cond_lock())
-}
-
 impl methods for lock_and_signal {
     unsafe fn lock<T>(f: fn() -> T) -> T {
         rustrt::rust_lock_cond_lock(self.lock);
@@ -180,7 +178,7 @@ mod tests {
     #[test]
     #[ignore] // this can go into infinite loops
     fn condition_variable() {
-        let lock = arc::arc(create_lock());
+        let lock = arc::arc(lock_and_signal());
         let lock2 = arc::clone(&lock);
 
         do task::spawn |move lock2| {