diff options
| author | bors <bors@rust-lang.org> | 2013-05-03 09:09:40 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-05-03 09:09:40 -0700 |
| commit | 79aeb529d5603e38e1e1ca0e0307eb9e998e1104 (patch) | |
| tree | d568b3892d1473826dbdb25eb97d32e8fa0d229e /src/rt/rust_task.cpp | |
| parent | d9c7d0bc938dd7a1d14e0d86fa0df439faa1ed3f (diff) | |
| parent | 6c478c7de889ec4943b9dcdcbfbb8a8244f479cc (diff) | |
| download | rust-79aeb529d5603e38e1e1ca0e0307eb9e998e1104.tar.gz rust-79aeb529d5603e38e1e1ca0e0307eb9e998e1104.zip | |
auto merge of #6046 : brson/rust/io, r=graydon
r? @pcwalton Sorry this is so big, and sorry the first commit is just titled 'wip'. Some interesting bits * [LocalServices](https://github.com/brson/rust/commit/f9069baa70ea78117f2087fe6e359fb2ea0ae16a) - This is the set of runtime capabilities that *all* Rust code should expect access to, including the local heap, GC, logging, unwinding. * [impl Reader, etc. for Option](https://github.com/brson/rust/commit/5fbb0949a53a6ac51c6d9b187ef4c464e52ae536) - Constructors like `File::open` return Option<FileStream>. This lets you write I/O code without ever unwrapping an option. This series adds a lot of [documentation](https://github.com/brson/rust/blob/io/src/libcore/rt/io/mod.rs#L11) to `core::rt::io`.
Diffstat (limited to 'src/rt/rust_task.cpp')
| -rw-r--r-- | src/rt/rust_task.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp index e6293aa5c1d..7e3c91f6211 100644 --- a/src/rt/rust_task.cpp +++ b/src/rt/rust_task.cpp @@ -36,7 +36,7 @@ rust_task::rust_task(rust_sched_loop *sched_loop, rust_task_state state, kernel(sched_loop->kernel), name(name), list_index(-1), - boxed(sched_loop->kernel->env, &local_region), + boxed(&local_region, sched_loop->kernel->env->poison_on_free), local_region(&sched_loop->local_region), unwinding(false), total_stack_sz(0), |