diff options
| author | toddaaro <github@opprobrio.us> | 2013-06-10 15:29:02 -0700 |
|---|---|---|
| committer | toddaaro <github@opprobrio.us> | 2013-06-10 15:29:02 -0700 |
| commit | d64d26cd39a86a40feb0db7a9147cc2ae5e82994 (patch) | |
| tree | 00cedc9e9b752fa99dfb552b73fa9359cd86b7ce /src/libstd/rt/task.rs | |
| parent | d4de99aa6c53b0eb0d5be2ccfc62e2c89b2cd2df (diff) | |
| download | rust-d64d26cd39a86a40feb0db7a9147cc2ae5e82994.tar.gz rust-d64d26cd39a86a40feb0db7a9147cc2ae5e82994.zip | |
debugged a compiler ICE when merging local::borrow changes into the main io branch and modified the incoming new file lang.rs to be api-compatible
Diffstat (limited to 'src/libstd/rt/task.rs')
| -rw-r--r-- | src/libstd/rt/task.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs index cf4967b12b3..4d9851d3b40 100644 --- a/src/libstd/rt/task.rs +++ b/src/libstd/rt/task.rs @@ -62,7 +62,7 @@ impl Task { pub fn run(&mut self, f: &fn()) { // This is just an assertion that `run` was called unsafely // and this instance of Task is still accessible. - do Local::borrow::<Task> |task| { + do Local::borrow::<Task, ()> |task| { assert!(ptr::ref_eq(task, self)); } @@ -87,7 +87,7 @@ impl Task { fn destroy(&mut self) { // This is just an assertion that `destroy` was called unsafely // and this instance of Task is still accessible. - do Local::borrow::<Task> |task| { + do Local::borrow::<Task, ()> |task| { assert!(ptr::ref_eq(task, self)); } match self.storage { |
