---

yaml
---
r: 6899
b: refs/heads/master
c: 085c813
h: refs/heads/master
i:
  6897: 9b0ea6b
  6895: 490000c
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbc534bcccfc1904104a1fa275a6a873a7675cd1
+refs/heads/master: 085c813fe3f03c67aa8e8cb7fa005886d9447c50

trunk/src/cargo/sources.json

@@ -3,7 +3,7 @@
 		"url": "https://raw.github.com/graydon/cargo-central/master/packages.json"
 	},
 	"elly": {
-		"url": "https://raw.github.com/elly/rust-packages/master/packages.json"
+		"url": "https://raw.github.com/elly/rust-packages/master/packages.json",
 		"sig": "https://raw.github.com/elly/rust-packages/master/packages.json.sig",
 		"key": "https://raw.github.com/elly/rust-packages/master/signing-key.gpg",
 		"keyfp": "4107 21C0 FF32 858F 61FF  33F6 E595 8E36 FDC8 EA00"

trunk/src/rt/rust_kernel.cpp

@@ -150,13 +150,11 @@ rust_kernel::fail() {
 
 rust_task_id
 rust_kernel::create_task(rust_task *spawner, const char *name) {
+    scoped_lock with(_kernel_lock);
     rust_scheduler *thread = threads[isaac_rand(&rctx) % num_threads];
     rust_task *t = thread->create_task(spawner, name);
-    {
-        scoped_lock with(_kernel_lock);
-        t->user.id = max_id++;
-        task_table.put(t->user.id, t);
-    }
+    t->user.id = max_id++;
+    task_table.put(t->user.id, t);
     return t->user.id;
 }
 

trunk/src/rt/rust_task.cpp

@@ -397,16 +397,6 @@ void rust_task::start()
     sched->lock.signal();
 }
 
-void
-rust_task::grow(size_t n_frame_bytes)
-{
-    // FIXME (issue #151): Just fail rather than almost certainly crashing
-    // mysteriously later. The commented-out logic below won't work at all in
-    // the presence of non-word-aligned pointers.
-    abort();
-
-}
-
 // Only run this on the rust stack
 void
 rust_task::yield(size_t time_in_us, bool *killed) {

trunk/src/rt/rust_task.h

@@ -138,7 +138,6 @@ rust_task : public kernel_owned<rust_task>, rust_cond
     void start(uintptr_t spawnee_fn,
                uintptr_t args);
     void start();
-    void grow(size_t n_frame_bytes);
     bool running();
     bool blocked();
     bool blocked_on(rust_cond *cond);