---

yaml
---
r: 3710
b: refs/heads/master
c: 3958c72
h: refs/heads/master
v: v3

Author: Eric Holk

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4739953b84b814de3b2b80f273f6292c33e33010
+refs/heads/master: 3958c72cd8c899bfc77a56ad859e31e13615c1c5

trunk/src/rt/memory.h

@@ -2,13 +2,6 @@
 #ifndef MEMORY_H
 #define MEMORY_H
 
-#if 0
-inline void operator delete(void *mem, rust_task *task) {
-    task->free(mem);
-    return;
-}
-#endif
-
 // FIXME: It would be really nice to be able to get rid of this.
 inline void *operator new[](size_t size, rust_task *task) {
     return task->malloc(size);

trunk/src/rt/rust_chan.cpp

@@ -88,7 +88,7 @@ void rust_chan::send(void *sptr) {
         buffer.dequeue(NULL);
     } else {
         rust_port *target_port = port->referent();
-        scoped_lock right(target_port->lock);
+        scoped_lock with(target_port->lock);
         if (target_port->task->blocked_on(target_port)) {
             DLOG(sched, comm, "dequeued in rendezvous_ptr");
             buffer.dequeue(target_port->task->rendezvous_ptr);