auto merge of rust-lang#10439 : brson/rust/rmcxx, r=bstrie

nikomatsakis · Nov 12, 2013 · 2ee72ba · 2ee72ba
2 parents 11b0784 + 6b6f89b
commit 2ee72ba
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 141 deletions.
diff --git a/src/rt/rust_builtin.cpp b/src/rt/rust_builtin.cpp
@@ -10,7 +10,6 @@
 
 /* Foreign builtins. */
 
-#include "rust_util.h"
 #include "sync/lock_and_signal.h"
 #include "vg/valgrind.h"
 
@@ -234,6 +233,16 @@ precise_time_ns(uint64_t *ns) {
 #endif
 }
 
+struct
+rust_vec
+{
+    size_t fill;    // in bytes; if zero, heapified
+    size_t alloc;   // in bytes
+    uint8_t data[0];
+};
+
+typedef rust_vec rust_str;
+
 struct rust_tm {
     int32_t tm_sec;
     int32_t tm_min;

diff --git a/src/rt/rust_test_helpers.cpp b/src/rt/rust_test_helpers.cpp
@@ -10,7 +10,6 @@
 
 // Helper functions used only in tests
 
-#include "rust_util.h"
 #include "sync/lock_and_signal.h"
 
 // These functions are used in the unit tests for C ABI calls.

diff --git a/src/rt/rust_type.h b/src/rt/rust_type.h
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "rust_globals.h"
-#include "rust_util.h"
 
 //Unwinding ABI declarations.
 typedef int _Unwind_Reason_Code;

diff --git a/src/rt/rust_util.h b/src/rt/rust_util.h