From 336a4df778129f906714830f429ad9c009434083 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Wed, 13 Jul 2011 14:03:18 -0700
Subject: [PATCH] Remove 'Nop.' comments, add emacs lines, remove obsolete
 file.

---
 mk/rt.mk                                |  1 -
 src/rt/memory_region.cpp                |  1 -
 src/rt/rust_message.cpp                 |  4 ----
 src/rt/rust_proxy.cpp                   |  1 -
 src/rt/rust_proxy.h                     |  3 ---
 src/rt/rust_srv.cpp                     | 16 +++++++++++-----
 src/rt/rust_task_list.cpp               |  1 -
 src/rt/rust_upcall.cpp                  |  1 -
 src/rt/sync/lock_free_queue.h           |  1 -
 src/rt/sync/sync.cpp                    |  1 -
 src/rt/sync/timer.cpp                   |  1 -
 src/rt/test/rust_test_runtime.h         |  3 ---
 src/rt/test/rust_test_util.h            |  2 --
 src/rt/util/indexed_list.h              |  1 -
 src/rt/util/synchronized_indexed_list.h |  1 -
 15 files changed, 11 insertions(+), 27 deletions(-)
 delete mode 100644 src/rt/rust_proxy.cpp

diff --git a/mk/rt.mk b/mk/rt.mk
index 7ada4c00695..72578bcdb40 100644
--- a/mk/rt.mk
+++ b/mk/rt.mk
@@ -13,7 +13,6 @@ RUNTIME_CS := rt/sync/timer.cpp \
               rt/rust_scheduler.cpp \
               rt/rust_task.cpp \
               rt/rust_task_list.cpp \
-              rt/rust_proxy.cpp \
               rt/rust_chan.cpp \
               rt/rust_port.cpp \
               rt/rust_upcall.cpp \
diff --git a/src/rt/memory_region.cpp b/src/rt/memory_region.cpp
index f08d7d5a25a..269f7f7e0cd 100644
--- a/src/rt/memory_region.cpp
+++ b/src/rt/memory_region.cpp
@@ -16,7 +16,6 @@ memory_region::memory_region(memory_region *parent) :
     _srv(parent->_srv), _parent(parent), _live_allocations(0),
     _detailed_leaks(parent->_detailed_leaks),
     _synchronized(parent->_synchronized) {
-    // Nop.
 }
 
 void memory_region::add_alloc() {
diff --git a/src/rt/rust_message.cpp b/src/rt/rust_message.cpp
index 06f08afd500..d2f1979a147 100644
--- a/src/rt/rust_message.cpp
+++ b/src/rt/rust_message.cpp
@@ -8,15 +8,12 @@ rust_message(memory_region *region, const char* label,
 }
 
 rust_message::~rust_message() {
-    // Nop.
 }
 
 void rust_message::process() {
-    // Nop.
 }
 
 void rust_message::kernel_process() {
-    // Nop.
 }
 
 notify_message::
@@ -113,7 +110,6 @@ rust_message_queue::rust_message_queue(rust_srv *srv, rust_kernel *kernel)
     : region(srv, true),
       kernel(kernel),
       sched_handle(NULL) {
-    // Nop.
 }
 
 //
diff --git a/src/rt/rust_proxy.cpp b/src/rt/rust_proxy.cpp
deleted file mode 100644
index 4629fca7421..00000000000
--- a/src/rt/rust_proxy.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "rust_internal.h"
diff --git a/src/rt/rust_proxy.h b/src/rt/rust_proxy.h
index b131a2ac972..2ab080be45e 100644
--- a/src/rt/rust_proxy.h
+++ b/src/rt/rust_proxy.h
@@ -17,7 +17,6 @@ protected:
     T *_referent;
 public:
     maybe_proxy(T *referent) : _referent(referent) {
-        // Nop.
     }
 
     T *referent() {
@@ -50,12 +49,10 @@ private:
 public:
     rust_proxy(rust_handle<T> *handle) :
         maybe_proxy<T> (NULL), _strong(FALSE), _handle(handle) {
-        // Nop.
     }
 
     rust_proxy(T *referent) :
         maybe_proxy<T> (referent), _strong(FALSE), _handle(NULL) {
-        // Nop.
     }
 
     rust_handle<T> *handle() {
diff --git a/src/rt/rust_srv.cpp b/src/rt/rust_srv.cpp
index 1587176fc8a..05c9d9d564c 100644
--- a/src/rt/rust_srv.cpp
+++ b/src/rt/rust_srv.cpp
@@ -1,13 +1,8 @@
-/*
- *
- */
-
 #include "rust_internal.h"
 #include "rust_srv.h"
 
 rust_srv::rust_srv() :
     local_region(this, false) {
-    // Nop.
 }
 
 rust_srv::~rust_srv() {}
@@ -79,3 +74,14 @@ rust_srv *
 rust_srv::clone() {
     return new rust_srv();
 }
+
+//
+// Local Variables:
+// mode: C++
+// fill-column: 78;
+// indent-tabs-mode: nil
+// c-basic-offset: 4
+// buffer-file-coding-system: utf-8-unix
+// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
+// End:
+//
diff --git a/src/rt/rust_task_list.cpp b/src/rt/rust_task_list.cpp
index 81441de35f5..96d3d7bd34a 100644
--- a/src/rt/rust_task_list.cpp
+++ b/src/rt/rust_task_list.cpp
@@ -2,7 +2,6 @@
 
 rust_task_list::rust_task_list (rust_scheduler *sched, const char* name) :
     sched(sched), name(name) {
-    // Nop;
 }
 
 void
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp
index 86b72c5aa63..1cf2e935e1a 100644
--- a/src/rt/rust_upcall.cpp
+++ b/src/rt/rust_upcall.cpp
@@ -130,7 +130,6 @@ upcall_new_chan(rust_task *task, rust_port *port) {
 extern "C" CDECL void
 upcall_flush_chan(rust_task *task, rust_chan *chan) {
     LOG_UPCALL_ENTRY(task);
-    // Nop.
 }
 
 /**
diff --git a/src/rt/sync/lock_free_queue.h b/src/rt/sync/lock_free_queue.h
index 03388bca573..377dd93e34e 100644
--- a/src/rt/sync/lock_free_queue.h
+++ b/src/rt/sync/lock_free_queue.h
@@ -50,7 +50,6 @@ class lock_free_queue {
         node_t *node;
         uint32_t count;
         pointer_t() : node(NULL), count(0) {
-            // Nop.
         }
         pointer_t(node_t *node, uint32_t count) {
             this->node = node;
diff --git a/src/rt/sync/sync.cpp b/src/rt/sync/sync.cpp
index 02da438b4f3..fd8c48936a4 100644
--- a/src/rt/sync/sync.cpp
+++ b/src/rt/sync/sync.cpp
@@ -20,7 +20,6 @@ void sync::sleep(size_t timeout_in_ms) {
 }
 
 rust_thread::rust_thread() : _is_running(false), thread(0) {
-    // Nop.
 }
 
 #if defined(__WIN32__)
diff --git a/src/rt/sync/timer.cpp b/src/rt/sync/timer.cpp
index 2c0f92a1cf6..8ef5634f2cd 100644
--- a/src/rt/sync/timer.cpp
+++ b/src/rt/sync/timer.cpp
@@ -72,5 +72,4 @@ timer::time_us() {
 }
 
 timer::~timer() {
-    // Nop.
 }
diff --git a/src/rt/test/rust_test_runtime.h b/src/rt/test/rust_test_runtime.h
index 8d4f38ecb79..eb8ebe225c1 100644
--- a/src/rt/test/rust_test_runtime.h
+++ b/src/rt/test/rust_test_runtime.h
@@ -16,7 +16,6 @@ public:
         public:
         rust_kernel *kernel;
         worker(rust_kernel *kernel) : kernel(kernel) {
-            // Nop.
         }
         void run();
     };
@@ -30,7 +29,6 @@ class rust_task_test : public rust_test {
 public:
     rust_test_suite *suite;
     rust_task_test(rust_test_suite *suite) : suite(suite) {
-        // Nop.
     }
     class worker : public rust_thread {
         public:
@@ -38,7 +36,6 @@ public:
         rust_task_test *parent;
         worker(rust_kernel *kernel, rust_task_test *parent) :
             kernel(kernel), parent(parent) {
-            // Nop.
         }
         void run();
     };
diff --git a/src/rt/test/rust_test_util.h b/src/rt/test/rust_test_util.h
index 41c3579043a..9ee3ee8bd36 100644
--- a/src/rt/test/rust_test_util.h
+++ b/src/rt/test/rust_test_util.h
@@ -21,14 +21,12 @@ public:
     synchronized_indexed_list<indexed_list_element<int> > list;
 
     rust_synchronized_indexed_list_test() {
-        // Nop.
     }
 
     class worker : public rust_thread {
     public:
         rust_synchronized_indexed_list_test *parent;
         worker(rust_synchronized_indexed_list_test *parent) : parent(parent) {
-            // Nop.
         }
         void run();
     };
diff --git a/src/rt/util/indexed_list.h b/src/rt/util/indexed_list.h
index 0c36604328f..feea4d5d044 100644
--- a/src/rt/util/indexed_list.h
+++ b/src/rt/util/indexed_list.h
@@ -15,7 +15,6 @@ class indexed_list_element : public indexed_list_object {
 public:
     T value;
     indexed_list_element(T value) : value(value) {
-        // Nop;
     }
 };
 
diff --git a/src/rt/util/synchronized_indexed_list.h b/src/rt/util/synchronized_indexed_list.h
index c4894351a57..f7c451ee5b1 100644
--- a/src/rt/util/synchronized_indexed_list.h
+++ b/src/rt/util/synchronized_indexed_list.h
@@ -10,7 +10,6 @@ template<typename T> class synchronized_indexed_list :
 
 public:
     synchronized_indexed_list() {
-        // Nop.
     }
 
     int32_t append(T *value) {