diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-06-04 00:01:40 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-06-06 23:00:01 -0700 |
| commit | 75014f7b1790e7ebdf13d38acc04dfdab6e450e9 (patch) | |
| tree | 46fb046e002a37ba60f6e8b8ef5ee0675fbb7fd8 /src/libgreen/lib.rs | |
| parent | d743b8831e6dc5b390af112cc23159d667cf583b (diff) | |
| download | rust-75014f7b1790e7ebdf13d38acc04dfdab6e450e9.tar.gz rust-75014f7b1790e7ebdf13d38acc04dfdab6e450e9.zip | |
libs: Fix miscellaneous fallout of librustrt
Diffstat (limited to 'src/libgreen/lib.rs')
| -rw-r--r-- | src/libgreen/lib.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libgreen/lib.rs b/src/libgreen/lib.rs index c75d69480ce..333ac80907f 100644 --- a/src/libgreen/lib.rs +++ b/src/libgreen/lib.rs @@ -160,7 +160,7 @@ //! # Using a scheduler pool //! //! ```rust -//! use std::task::TaskOpts; +//! use std::rt::task::TaskOpts; //! use green::{SchedPool, PoolConfig}; //! use green::sched::{PinnedTask, TaskFromFriend}; //! @@ -221,10 +221,10 @@ use std::mem::replace; use std::os; use std::rt::rtio; use std::rt::thread::Thread; +use std::rt::task::TaskOpts; use std::rt; use std::sync::atomics::{SeqCst, AtomicUint, INIT_ATOMIC_UINT}; use std::sync::deque; -use std::task::TaskOpts; use sched::{Shutdown, Scheduler, SchedHandle, TaskFromFriend, NewNeighbor}; use sleeper_list::SleeperList; @@ -319,7 +319,7 @@ pub fn run(event_loop_factory: fn() -> Box<rtio::EventLoop:Send>, let mut pool = SchedPool::new(cfg); let (tx, rx) = channel(); let mut opts = TaskOpts::new(); - opts.notify_chan = Some(tx); + opts.on_exit = Some(proc(r) tx.send(r)); opts.name = Some("<main>".into_maybe_owned()); pool.spawn(opts, main); |
