diff options
| author | bors <bors@rust-lang.org> | 2014-05-03 10:56:57 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-05-03 10:56:57 -0700 |
| commit | 0c691df8acaf10aa3721476e5d7fafcee11b0aaa (patch) | |
| tree | 7aca9144c64039fea0aff444e13870b4be40fae7 /src/libstd/rt/thread.rs | |
| parent | bca9647cd34c78a1c7c2409fbb2c31cb2c8194d7 (diff) | |
| parent | a5be12ce7e88c1d28de1c98215991127d1e765f0 (diff) | |
| download | rust-0c691df8acaf10aa3721476e5d7fafcee11b0aaa.tar.gz rust-0c691df8acaf10aa3721476e5d7fafcee11b0aaa.zip | |
auto merge of #13773 : brson/rust/boxxy, r=alexcrichton
`box` is the way you allocate in future-rust.
Diffstat (limited to 'src/libstd/rt/thread.rs')
| -rw-r--r-- | src/libstd/rt/thread.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/rt/thread.rs b/src/libstd/rt/thread.rs index 9f5986e3dc6..a836958279b 100644 --- a/src/libstd/rt/thread.rs +++ b/src/libstd/rt/thread.rs @@ -80,12 +80,12 @@ impl Thread<()> { // We need the address of the packet to fill in to be stable so when // `main` fills it in it's still valid, so allocate an extra ~ box to do // so. - let packet = ~None; + let packet = box None; let packet2: *mut Option<T> = unsafe { *cast::transmute::<&~Option<T>, **mut Option<T>>(&packet) }; let main = proc() unsafe { *packet2 = Some(main()); }; - let native = unsafe { imp::create(stack, ~main) }; + let native = unsafe { imp::create(stack, box main) }; Thread { native: native, @@ -108,7 +108,7 @@ impl Thread<()> { /// stack size for the new thread. pub fn spawn_stack(stack: uint, main: proc():Send) { unsafe { - let handle = imp::create(stack, ~main); + let handle = imp::create(stack, box main); imp::detach(handle); } } |
