---

yaml
---
r: 23138
b: refs/heads/master
c: 42825fb
h: refs/heads/master
v: v3

Author: bblum

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 4808d59909b9350fcb557ec7e6f0ce21c505e803
+refs/heads/master: 42825fbea659b555e7624c5a4f2e0f5bc3264c24
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/arc.rs

@@ -39,7 +39,7 @@ export float, f32, f64;
 export box, char, str, ptr, vec, at_vec, bool;
 export either, option, result, iter;
 export libc, os, io, run, rand, sys, unsafe, logging;
-export arc, comm, task, future, pipes, sync;
+export comm, task, future, pipes;
 export extfmt;
 // The test harness links against core, so don't include runtime in tests.
 // FIXME (#2861): Uncomment this after snapshot gets updated.
@@ -199,12 +199,10 @@ mod dlist_iter {
 mod send_map;
 
 // Concurrency
-mod arc;
 mod comm;
 mod task;
 mod future;
 mod pipes;
-mod sync;
 
 // Runtime and language-primitive support
 

trunk/src/libcore/core.rc

@@ -1064,7 +1064,7 @@ impl<T: send> port<T>: selectable {
 }
 
 /// A channel that can be shared between many senders.
-type shared_chan<T: send> = arc::exclusive<chan<T>>;
+type shared_chan<T: send> = unsafe::exclusive<chan<T>>;
 
 impl<T: send> shared_chan<T>: channel<T> {
     fn send(+x: T) {
@@ -1088,7 +1088,7 @@ impl<T: send> shared_chan<T>: channel<T> {
 
 /// Converts a `chan` into a `shared_chan`.
 fn shared_chan<T:send>(+c: chan<T>) -> shared_chan<T> {
-    arc::exclusive(c)
+    unsafe::exclusive(c)
 }
 
 /// Receive a message from one of two endpoints.

trunk/src/libcore/pipes.rs

@@ -7,27 +7,17 @@ export min_align_of;
 export pref_align_of;
 export refcount;
 export log_str;
-export little_lock, methods;
 export shape_eq, shape_lt, shape_le;
 
-import task::atomically;
-
 enum type_desc = {
     size: uint,
     align: uint
     // Remaining fields not listed
 };
 
-type rust_little_lock = *libc::c_void;
-
 #[abi = "cdecl"]
 extern mod rustrt {
     pure fn shape_log_str(t: *sys::type_desc, data: *()) -> ~str;
-
-    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);
 }
 
 #[abi = "rust-intrinsic"]
@@ -98,30 +88,6 @@ pure fn log_str<T>(t: T) -> ~str {
     }
 }
 
-class little_lock {
-    let l: rust_little_lock;
-    new() {
-        self.l = rustrt::rust_create_little_lock();
-    }
-    drop { rustrt::rust_destroy_little_lock(self.l); }
-}
-
-impl little_lock {
-    unsafe fn lock<T>(f: fn() -> T) -> T {
-        class unlock {
-            let l: rust_little_lock;
-            new(l: rust_little_lock) { self.l = l; }
-            drop { rustrt::rust_unlock_little_lock(self.l); }
-        }
-
-        do atomically {
-            rustrt::rust_lock_little_lock(self.l);
-            let _r = unlock(self.l);
-            f()
-        }
-    }
-}
-
 #[cfg(test)]
 mod tests {