diff options
| author | bors <bors@rust-lang.org> | 2013-06-25 04:38:06 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-06-25 04:38:06 -0700 |
| commit | 7aee5da08db11dc597907bf228c2e716a408fdab (patch) | |
| tree | 7217207f8ec916aca96034f94d64a15746e22f79 /src/rt/rust_task.cpp | |
| parent | b11346bb5d2659313eb96f3108137f01239785c9 (diff) | |
| parent | f8ae3cdcaacb29c7b56e546a9ddab1396b615f8f (diff) | |
| download | rust-7aee5da08db11dc597907bf228c2e716a408fdab.tar.gz rust-7aee5da08db11dc597907bf228c2e716a408fdab.zip | |
auto merge of #7254 : Blei/rust/intrinsic-overhaul, r=cmr
This sets the `get_tydesc()` return type correctly and removes the intrinsic module. See #3730, #3475. Update: this now also removes the unused shape fields in tydescs.
Diffstat (limited to 'src/rt/rust_task.cpp')
| -rw-r--r-- | src/rt/rust_task.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp index fe1b4622137..81ae991623f 100644 --- a/src/rt/rust_task.cpp +++ b/src/rt/rust_task.cpp @@ -183,7 +183,11 @@ void task_start_wrapper(spawn_args *a) if(env) { // free the environment (which should be a unique closure). const type_desc *td = env->td; - td->drop_glue(NULL, NULL, box_body(env)); + td->drop_glue(NULL, +#ifdef _RUST_STAGE0 + NULL, +#endif + box_body(env)); task->kernel->region()->free(env); } |
