about summary refs log tree commit diff
path: root/src/libstd/workcache.rs
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2013-04-26 18:52:15 -0700
committerPatrick Walton <pcwalton@mimiga.net>2013-04-29 14:30:57 -0700
commit37abf4bad0eda08cf4ef756310443329fa28f6cf (patch)
treee9bdcfadf21cd0d1a6001a09af5a336cb9db7d50 /src/libstd/workcache.rs
parent670ab8ac367cd8cfe8b86a1338667e7825d8d68d (diff)
downloadrust-37abf4bad0eda08cf4ef756310443329fa28f6cf.tar.gz
rust-37abf4bad0eda08cf4ef756310443329fa28f6cf.zip
librustc: Forbid type implementations on typedefs.
Diffstat (limited to 'src/libstd/workcache.rs')
-rw-r--r--src/libstd/workcache.rs13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/libstd/workcache.rs b/src/libstd/workcache.rs
index ae09b9b9026..bb4a9e97ea1 100644
--- a/src/libstd/workcache.rs
+++ b/src/libstd/workcache.rs
@@ -16,10 +16,13 @@ use serialize::{Encoder, Encodable, Decoder, Decodable};
 use sort;
 
 use core::cell::Cell;
-use core::comm::{oneshot, PortOne, send_one};
+use core::cmp;
+use core::comm::{ChanOne, PortOne, oneshot, send_one};
+use core::either::{Either, Left, Right};
+use core::hashmap::HashMap;
+use core::io;
 use core::pipes::recv;
 use core::run;
-use core::hashmap::HashMap;
 use core::to_bytes;
 
 /**
@@ -340,13 +343,13 @@ impl TPrep for Prep {
             }
 
             _ => {
-                let (chan, port) = oneshot::init();
+                let (port, chan) = oneshot();
                 let mut blk = None;
                 blk <-> bo;
                 let blk = blk.unwrap();
                 let chan = Cell(chan);
 
-                do task::spawn || {
+                do task::spawn {
                     let exe = Exec {
                         discovered_inputs: WorkMap::new(),
                         discovered_outputs: WorkMap::new(),
@@ -383,7 +386,7 @@ fn unwrap<T:Owned +
         None => fail!(),
         Some(Left(v)) => v,
         Some(Right(port)) => {
-            let (exe, v) = match recv(port) {
+            let (exe, v) = match recv(port.unwrap()) {
                 oneshot::send(data) => data
             };