rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mozilla/master'

Browse Source 
Conflicts:
	src/libextra/test.rs
	src/libstd/at_vec.rs
	src/libstd/cleanup.rs
	src/libstd/rt/comm.rs
	src/libstd/rt/global_heap.rs
	src/libstd/task/spawn.rs
	src/libstd/unstable/lang.rs
	src/libstd/vec.rs
	src/rt/rustrt.def.in
	src/test/run-pass/extern-pub.rs
This commit is contained in:
Brian Anderson
2013-07-02 17:36:58 -07:00
parent f8a4d09f7e ab34864a30
commit 1098d6980b
765 changed files with 23500 additions and 17316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/rt/rust_builtin.cpp
View File

@@ -74,13 +74,6 @@ rust_local_realloc(rust_opaque_box *ptr, size_t size) {
return task->boxed.realloc(ptr, size);
}
// This is completely misnamed.
extern "C" CDECL void
vec_reserve_shared(type_desc* ty, rust_vec_box** vp,
size_t n_elts) {
reserve_vec_exact(vp, n_elts * ty->size);
}
extern "C" CDECL size_t
rand_seed_size() {
return rng_seed_size();
@@ -153,6 +146,16 @@ debug_abi_2(floats f) {
return ff;
}
extern "C" int
debug_static_mut;
int debug_static_mut = 3;
extern "C" void
debug_static_mut_check_four() {
assert(debug_static_mut == 4);
}
/* Debug builtins for std::dbg. */
static void
@@ -734,15 +737,6 @@ rust_task_deref(rust_task *task) {
task->deref();
}
// Must call on rust stack.
extern "C" CDECL void
rust_call_tydesc_glue(void *root, size_t *tydesc, size_t glue_index) {
void (*glue_fn)(void *, void *, void *) =
(void (*)(void *, void *, void *))tydesc[glue_index];
if (glue_fn)
glue_fn(0, 0, root);
}
// Don't run on the Rust stack!
extern "C" void
rust_log_str(uint32_t level, const char *str, size_t size) {