Skip to content

Commit 5f4b060

Browse files
committed
---
yaml --- r: 3891 b: refs/heads/master c: 336a4df h: refs/heads/master i: 3889: 861c295 3887: 3e36109 v: v3
1 parent 8af7ef4 commit 5f4b060

16 files changed

+12
-28
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 733fbf47139402c2c56552ae1480bae0b77d1242
2+
refs/heads/master: 336a4df778129f906714830f429ad9c009434083

trunk/mk/rt.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ RUNTIME_CS := rt/sync/timer.cpp \
1313
rt/rust_scheduler.cpp \
1414
rt/rust_task.cpp \
1515
rt/rust_task_list.cpp \
16-
rt/rust_proxy.cpp \
1716
rt/rust_chan.cpp \
1817
rt/rust_port.cpp \
1918
rt/rust_upcall.cpp \

trunk/src/rt/memory_region.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ memory_region::memory_region(memory_region *parent) :
1616
_srv(parent->_srv), _parent(parent), _live_allocations(0),
1717
_detailed_leaks(parent->_detailed_leaks),
1818
_synchronized(parent->_synchronized) {
19-
// Nop.
2019
}
2120

2221
void memory_region::add_alloc() {

trunk/src/rt/rust_message.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,12 @@ rust_message(memory_region *region, const char* label,
88
}
99

1010
rust_message::~rust_message() {
11-
// Nop.
1211
}
1312

1413
void rust_message::process() {
15-
// Nop.
1614
}
1715

1816
void rust_message::kernel_process() {
19-
// Nop.
2017
}
2118

2219
notify_message::
@@ -113,7 +110,6 @@ rust_message_queue::rust_message_queue(rust_srv *srv, rust_kernel *kernel)
113110
: region(srv, true),
114111
kernel(kernel),
115112
sched_handle(NULL) {
116-
// Nop.
117113
}
118114

119115
//

trunk/src/rt/rust_proxy.cpp

Lines changed: 0 additions & 1 deletion
This file was deleted.

trunk/src/rt/rust_proxy.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ maybe_proxy : public rc_base<T>, public rust_cond {
1717
T *_referent;
1818
public:
1919
maybe_proxy(T *referent) : _referent(referent) {
20-
// Nop.
2120
}
2221

2322
T *referent() {
@@ -50,12 +49,10 @@ rust_proxy : public maybe_proxy<T> {
5049
public:
5150
rust_proxy(rust_handle<T> *handle) :
5251
maybe_proxy<T> (NULL), _strong(FALSE), _handle(handle) {
53-
// Nop.
5452
}
5553

5654
rust_proxy(T *referent) :
5755
maybe_proxy<T> (referent), _strong(FALSE), _handle(NULL) {
58-
// Nop.
5956
}
6057

6158
rust_handle<T> *handle() {

trunk/src/rt/rust_srv.cpp

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
/*
2-
*
3-
*/
4-
51
#include "rust_internal.h"
62
#include "rust_srv.h"
73

84
rust_srv::rust_srv() :
95
local_region(this, false) {
10-
// Nop.
116
}
127

138
rust_srv::~rust_srv() {}
@@ -79,3 +74,14 @@ rust_srv *
7974
rust_srv::clone() {
8075
return new rust_srv();
8176
}
77+
78+
//
79+
// Local Variables:
80+
// mode: C++
81+
// fill-column: 78;
82+
// indent-tabs-mode: nil
83+
// c-basic-offset: 4
84+
// buffer-file-coding-system: utf-8-unix
85+
// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
86+
// End:
87+
//

trunk/src/rt/rust_task_list.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
rust_task_list::rust_task_list (rust_scheduler *sched, const char* name) :
44
sched(sched), name(name) {
5-
// Nop;
65
}
76

87
void

trunk/src/rt/rust_upcall.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ upcall_new_chan(rust_task *task, rust_port *port) {
130130
extern "C" CDECL void
131131
upcall_flush_chan(rust_task *task, rust_chan *chan) {
132132
LOG_UPCALL_ENTRY(task);
133-
// Nop.
134133
}
135134

136135
/**

trunk/src/rt/sync/lock_free_queue.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ class lock_free_queue {
5050
node_t *node;
5151
uint32_t count;
5252
pointer_t() : node(NULL), count(0) {
53-
// Nop.
5453
}
5554
pointer_t(node_t *node, uint32_t count) {
5655
this->node = node;

trunk/src/rt/sync/sync.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ void sync::sleep(size_t timeout_in_ms) {
2020
}
2121

2222
rust_thread::rust_thread() : _is_running(false), thread(0) {
23-
// Nop.
2423
}
2524

2625
#if defined(__WIN32__)

trunk/src/rt/sync/timer.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,4 @@ timer::time_us() {
7272
}
7373

7474
timer::~timer() {
75-
// Nop.
7675
}

trunk/src/rt/test/rust_test_runtime.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ class rust_domain_test : public rust_test {
1616
public:
1717
rust_kernel *kernel;
1818
worker(rust_kernel *kernel) : kernel(kernel) {
19-
// Nop.
2019
}
2120
void run();
2221
};
@@ -30,15 +29,13 @@ class rust_task_test : public rust_test {
3029
public:
3130
rust_test_suite *suite;
3231
rust_task_test(rust_test_suite *suite) : suite(suite) {
33-
// Nop.
3432
}
3533
class worker : public rust_thread {
3634
public:
3735
rust_kernel *kernel;
3836
rust_task_test *parent;
3937
worker(rust_kernel *kernel, rust_task_test *parent) :
4038
kernel(kernel), parent(parent) {
41-
// Nop.
4239
}
4340
void run();
4441
};

trunk/src/rt/test/rust_test_util.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@ class rust_synchronized_indexed_list_test : public rust_test {
2121
synchronized_indexed_list<indexed_list_element<int> > list;
2222

2323
rust_synchronized_indexed_list_test() {
24-
// Nop.
2524
}
2625

2726
class worker : public rust_thread {
2827
public:
2928
rust_synchronized_indexed_list_test *parent;
3029
worker(rust_synchronized_indexed_list_test *parent) : parent(parent) {
31-
// Nop.
3230
}
3331
void run();
3432
};

trunk/src/rt/util/indexed_list.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ class indexed_list_element : public indexed_list_object {
1515
public:
1616
T value;
1717
indexed_list_element(T value) : value(value) {
18-
// Nop;
1918
}
2019
};
2120

trunk/src/rt/util/synchronized_indexed_list.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ template<typename T> class synchronized_indexed_list :
1010

1111
public:
1212
synchronized_indexed_list() {
13-
// Nop.
1413
}
1514

1615
int32_t append(T *value) {

0 commit comments

Comments
 (0)