about summary refs log tree commit diff
path: root/src/libnative/task.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-06-28 20:11:34 +0000
committerbors <bors@rust-lang.org>2014-06-28 20:11:34 +0000
commitfe8bc178014dc2c5badd8443329c179478a40cc4 (patch)
treeb5bfc8f15cc996fe751306924595f81bcc558a27 /src/libnative/task.rs
parentde337f3ddfbef800a8cf731e0b593e341af1e3e5 (diff)
parent0dfc90ab15475aa64bea393671463a8e9784ae3f (diff)
downloadrust-fe8bc178014dc2c5badd8443329c179478a40cc4.tar.gz
rust-fe8bc178014dc2c5badd8443329c179478a40cc4.zip
auto merge of #15208 : alexcrichton/rust/snapshots, r=pcwalton
This change registers new snapshots, allowing `*T` to be removed from the language. This is a large breaking change, and it is recommended that if compiler errors are seen that any FFI calls are audited to determine whether they should be actually taking `*mut T`.
Diffstat (limited to 'src/libnative/task.rs')
-rw-r--r--src/libnative/task.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libnative/task.rs b/src/libnative/task.rs
index 0b863d9f694..7ba588ac21c 100644
--- a/src/libnative/task.rs
+++ b/src/libnative/task.rs
@@ -81,7 +81,7 @@ pub fn spawn_opts(opts: TaskOpts, f: proc():Send) {
     // which our stack started).
     Thread::spawn_stack(stack, proc() {
         let something_around_the_top_of_the_stack = 1;
-        let addr = &something_around_the_top_of_the_stack as *int;
+        let addr = &something_around_the_top_of_the_stack as *const int;
         let my_stack = addr as uint;
         unsafe {
             stack::record_stack_bounds(my_stack - stack + 1024, my_stack);
@@ -198,7 +198,7 @@ impl rt::Runtime for Ops {
         cur_task.put_runtime(self);
 
         unsafe {
-            let cur_task_dupe = &*cur_task as *Task;
+            let cur_task_dupe = &mut *cur_task as *mut Task;
             let task = BlockedTask::block(cur_task);
 
             if times == 1 {