From 8def3195c6d34c4ec77257cc97a98bda34ed94f4 Mon Sep 17 00:00:00 2001 From: Andrew Gallant Date: Wed, 17 Dec 2014 11:27:28 -0500 Subject: Starting upgrade to latest Rust. --- Cargo.lock | 18 +++++++++--------- src/cmd/frequency.rs | 2 +- src/cmd/split.rs | 2 +- src/cmd/stats.rs | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b193a07..4cd2445 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,31 +2,31 @@ name = "xsv" version = "0.7.1" dependencies = [ - "csv 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", - "docopt 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)", - "quickcheck 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "streaming-stats 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "csv 0.7.5 (registry+https://github.com/rust-lang/crates.io-index)", + "docopt 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", + "quickcheck 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "streaming-stats 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "tabwriter 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "csv" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "docopt" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "quickcheck" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "streaming-stats" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -34,6 +34,6 @@ name = "tabwriter" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "docopt 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)", + "docopt 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/src/cmd/frequency.rs b/src/cmd/frequency.rs index 9741905..2edf168 100644 --- a/src/cmd/frequency.rs +++ b/src/cmd/frequency.rs @@ -152,7 +152,7 @@ impl Args { let (send, recv) = channel(); for i in range(0, nchunks) { let (send, args, sel) = (send.clone(), self.clone(), sel.clone()); - pool.execute(proc() { + pool.execute(move || { let mut idx = args.rconfig().indexed().unwrap().unwrap(); idx.seek((i * chunk_size) as u64).unwrap(); let it = idx.csv().byte_records().take(chunk_size); diff --git a/src/cmd/split.rs b/src/cmd/split.rs index f6b04b9..2c4572d 100644 --- a/src/cmd/split.rs +++ b/src/cmd/split.rs @@ -91,7 +91,7 @@ impl Args { let pool = TaskPool::new(self.njobs()); for i in range(0, nchunks) { let args = self.clone(); - pool.execute(proc() { + pool.execute(move || { let conf = args.rconfig(); let mut idx = conf.indexed().unwrap().unwrap(); let headers = idx.csv().byte_headers().unwrap(); diff --git a/src/cmd/stats.rs b/src/cmd/stats.rs index 2560b16..4944af7 100644 --- a/src/cmd/stats.rs +++ b/src/cmd/stats.rs @@ -133,7 +133,7 @@ impl Args { let (send, recv) = channel(); for i in range(0, nchunks) { let (send, args, sel) = (send.clone(), self.clone(), sel.clone()); - pool.execute(proc() { + pool.execute(move || { let mut idx = args.rconfig().indexed().unwrap().unwrap(); idx.seek((i * chunk_size) as u64).unwrap(); let it = idx.csv().byte_records().take(chunk_size); @@ -154,7 +154,7 @@ impl Args { for mut stat in stats.into_iter() { let (tx, rx) = channel(); results.push(rx); - pool.execute(proc() { tx.send(stat.to_record()); }); + pool.execute(move || { tx.send(stat.to_record()); }); } for (i, rx) in results.into_iter().enumerate() { records[i] = rx.recv(); -- cgit v1.2.3