---

yaml
---
r: 32418
b: refs/heads/dist-snap
c: d155410
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 2d116cbbed3180d06446407b9cb63811853011ad
+refs/heads/dist-snap: d1554106742fa8c0a99cac1adc5f65aa0ce0ac62
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rt/rust_task.cpp

@@ -23,8 +23,8 @@ rust_task::rust_task(rust_sched_loop *sched_loop, rust_task_state state,
     name(name),
     list_index(-1),
     rendezvous_ptr(0),
-    local_region(&sched_loop->local_region),
     boxed(sched_loop->kernel->env, &local_region),
+    local_region(&sched_loop->local_region),
     unwinding(false),
     cc_counter(0),
     total_stack_sz(0),

branches/dist-snap/src/rt/rust_task.h

@@ -214,8 +214,8 @@ rust_task : public kernel_owned<rust_task>
     // that location before waking us up.
     uintptr_t* rendezvous_ptr;
 
-    memory_region local_region;
     boxed_region boxed;
+    memory_region local_region;
 
     // Indicates that fail() has been called and we are cleaning up.
     // We use this to suppress the "killed" flag during calls to yield.