diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2013-09-20 02:08:47 -0400 |
|---|---|---|
| committer | Daniel Micay <danielmicay@gmail.com> | 2013-10-09 09:17:29 -0400 |
| commit | 6a90e80b6240d8213f2b99fa470ef6ee04552d1b (patch) | |
| tree | e7ae38c849741fc9345652311dfa374f36b4be9a /src/libstd/rt/uv | |
| parent | f647ccc79c38c1f80dbdb697900b2ba97e293263 (diff) | |
| download | rust-6a90e80b6240d8213f2b99fa470ef6ee04552d1b.tar.gz rust-6a90e80b6240d8213f2b99fa470ef6ee04552d1b.zip | |
option: rewrite the API to use composition
Diffstat (limited to 'src/libstd/rt/uv')
| -rw-r--r-- | src/libstd/rt/uv/process.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/uv/uvio.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/rt/uv/process.rs b/src/libstd/rt/uv/process.rs index ddaf0c28725..176754de8f7 100644 --- a/src/libstd/rt/uv/process.rs +++ b/src/libstd/rt/uv/process.rs @@ -46,7 +46,7 @@ impl Process { exit_cb: uv::ExitCallback) -> Result<~[Option<UvPipeStream>], uv::UvError> { - let cwd = config.cwd.map_move(|s| s.to_c_str()); + let cwd = config.cwd.map(|s| s.to_c_str()); extern fn on_exit(p: *uvll::uv_process_t, exit_status: libc::c_int, diff --git a/src/libstd/rt/uv/uvio.rs b/src/libstd/rt/uv/uvio.rs index f9b71db7043..1de6042003c 100644 --- a/src/libstd/rt/uv/uvio.rs +++ b/src/libstd/rt/uv/uvio.rs @@ -74,7 +74,7 @@ trait HomingIO { * * RESOLUTION IDEA: Since the task is dead, we should just abort the IO action. */ - do task.wake().map_move |mut task| { + do task.wake().map |mut task| { *ptr = Some(task.take_unwrap_home()); self.home().send(PinnedTask(task)); }; @@ -97,7 +97,7 @@ trait HomingIO { * * RESOLUTION IDEA: Since the task is dead, we should just abort the IO action. */ - do task.wake().map_move |mut task| { + do task.wake().map |mut task| { task.give_home(old.take()); scheduler.make_handle().send(TaskFromFriend(task)); }; @@ -1672,7 +1672,7 @@ fn test_simple_homed_udp_io_bind_then_move_task_then_home_and_close() { let scheduler: ~Scheduler = Local::take(); do scheduler.deschedule_running_task_and_then |_, task| { // unblock task - do task.wake().map_move |task| { + do task.wake().map |task| { // send self to sched2 tasksFriendHandle.take().send(TaskFromFriend(task)); }; |