diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-04-01 13:30:51 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-04-01 13:30:51 -0700 |
| commit | 9bb05fd41403c6fc28b82e8eff35f8791876ac18 (patch) | |
| tree | 735ecba6abbc1915e7298dae72cbe034b7cf9d88 /src/libstd/sys | |
| parent | e9bacbaa2c9c88aaecf07ee30f02d08a1999e5c6 (diff) | |
| parent | 8eed73feb659633ef809e2af3399e53d5de6c6fa (diff) | |
| download | rust-9bb05fd41403c6fc28b82e8eff35f8791876ac18.tar.gz rust-9bb05fd41403c6fc28b82e8eff35f8791876ac18.zip | |
rollup merge of #23939: nikomatsakis/fn-box
Conflicts: src/liballoc/boxed.rs
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/common/thread.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/sys/common/thread.rs b/src/libstd/sys/common/thread.rs index f45daea18a2..1845b6266ed 100644 --- a/src/libstd/sys/common/thread.rs +++ b/src/libstd/sys/common/thread.rs @@ -25,6 +25,7 @@ pub fn start_thread(main: *mut libc::c_void) { unsafe { stack::record_os_managed_stack_bounds(0, usize::MAX); let _handler = stack_overflow::Handler::new(); - Box::from_raw(main as *mut Thunk).invoke(()); + let main: Box<Thunk> = Box::from_raw(main as *mut Thunk); + main(); } } |