rustup

src/cmd/cat.rs

@@ -41,7 +41,7 @@ Common options:
                            Must be a single character. (default: ,)
 ";
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     cmd_rows: bool,
     cmd_columns: bool,

src/cmd/count.rs

@@ -21,7 +21,7 @@ Common options:
                            Must be a single character. (default: ,)
 ";
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     arg_input: Option<String>,
     flag_no_headers: bool,

src/cmd/fixlengths.rs

@@ -31,7 +31,7 @@ Common options:
                            Must be a single character. (default: ,)
 ";
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     arg_input: Option<String>,
     flag_length: Option<uint>,

src/cmd/flatten.rs

@@ -37,7 +37,7 @@ Common options:
                            Must be a single character. (default: ,)
 ";
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     arg_input: Option<String>,
     flag_condense: Option<uint>,

src/cmd/fmt.rs

@@ -29,7 +29,7 @@ Common options:
                            Must be a single character. (default: ,)
 ";
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     arg_input: Option<String>,
     flag_out_delimiter: Option<Delimiter>,

src/cmd/frequency.rs

@@ -1,8 +1,8 @@
-use std::io::{mod, File};
+use std::io::{self, File};
 use std::iter::range;
 use std::os;
 
-use csv::{mod, ByteString};
+use csv::{self, ByteString};
 use csv::index::Indexed;
 use stats::{Frequencies, merge_all};
 
@@ -59,7 +59,7 @@ Common options:
                            Must be a single character. (default: ,)
 ";
 
-#[deriving(Clone, RustcDecodable)]
+#[derive(Clone, RustcDecodable)]
 struct Args {
     arg_input: Option<String>,
     flag_select: SelectColumns,
@@ -136,8 +136,8 @@ impl Args {
 
     fn parallel_ftables(&self, idx: &mut Indexed<io::File, io::File>)
                        -> CliResult<(Headers, FTables)> {
-        use std::comm::channel;
         use std::sync::TaskPool;
+        use std::sync::mpsc::channel;
 
         let mut rdr = try!(self.rconfig().reader());
         let (headers, sel) = try!(self.sel_headers(&mut rdr));
@@ -157,16 +157,15 @@ impl Args {
                 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);
-                send.send(args.ftables(&sel, it).unwrap());
+                send.send(args.ftables(&sel, it).unwrap()).unwrap();
             });
         }
         drop(send);
         Ok((headers, merge_all(recv.iter()).unwrap()))
     }
 
-    fn ftables<I: Iterator<csv::CsvResult<ByteRow>>>
-              (&self, sel: &Selection, mut it: I)
-              -> CliResult<FTables> {
+    fn ftables<I>(&self, sel: &Selection, mut it: I) -> CliResult<FTables>
+            where I: Iterator<Item=csv::CsvResult<ByteRow>> {
         let null = ByteString::from_bytes(b"");
         let nsel = sel.normal();
         let mut tabs: Vec<_> =

src/cmd/headers.rs

@@ -31,7 +31,7 @@ Common options:
                            Must be a single character. (default: ,)
 ";
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     arg_input: Vec<String>,
     flag_just_names: bool,

src/cmd/index.rs

@@ -32,7 +32,7 @@ Common options:
                            Must be a single character. (default: ,)
 ";
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     arg_input: String,
     flag_output: Option<String>,

src/cmd/join.rs

@@ -4,7 +4,7 @@ use std::io;
 use std::iter::repeat;
 use std::str;
 
-use csv::{mod, ByteString};
+use csv::{self, ByteString};
 use csv::index::Indexed;
 
 use CliResult;
@@ -69,7 +69,7 @@ Common options:
                            Must be a single character. (default: ,)
 ";
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     arg_columns1: SelectColumns,
     arg_input1: String,

src/cmd/sample.rs

@@ -1,6 +1,6 @@
 use std::rand::Rng;
 
-use csv::{mod, ByteString};
+use csv::{self, ByteString};
 use csv::index::Indexed;
 
 use CliResult;
@@ -37,7 +37,7 @@ Common options:
                            Must be a single character. (default: ,)
 ";
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     arg_input: Option<String>,
     arg_sample_size: u64,

src/cmd/search.rs

@@ -31,7 +31,7 @@ Common options:
                            Must be a single character. (default: ,)
 ";
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     arg_input: Option<String>,
     arg_regex: String,

src/cmd/select.rs

@@ -18,7 +18,7 @@ Common options:
                            Must be a single character. (default: ,)
 ";
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     arg_input: Option<String>,
     arg_selection: SelectColumns,
@@ -42,12 +42,14 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
     let sel = try!(rconfig.selection(headers[]));
 
     if !rconfig.no_headers {
-        try!(wtr.write(sel.select(headers[])));
+        try!(wtr.write(sel.as_slice().iter().map(|&i| headers[i].as_slice())));
     }
     for r in rdr.byte_records() {
         // TODO: I don't think we can do any better here. Since selection
         // operates on indices, some kind of allocation is probably required.
-        try!(wtr.write(sel.select(try!(r)[])))
+        // try!(wtr.write(sel.select(try!(r)[])))
+        let r = try!(r);
+        try!(wtr.write(sel.as_slice().iter().map(|&i| r[i].as_slice())));
     }
     try!(wtr.flush());
     Ok(())

src/cmd/slice.rs

@@ -41,7 +41,7 @@ Common options:
                            Must be a single character. (default: ,)
 ";
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     arg_input: Option<String>,
     flag_start: Option<uint>,

src/cmd/sort.rs

@@ -28,7 +28,7 @@ Common options:
                            Must be a single character. (default: ,)
 ";
 
-#[deriving(RustcDecodable)]
+#[derive(RustcDecodable)]
 struct Args {
     arg_input: Option<String>,
     flag_select: SelectColumns,

src/cmd/split.rs

@@ -40,7 +40,7 @@ Common options:
                            Must be a single character. (default: ,)
 ";
 
-#[deriving(Clone, RustcDecodable)]
+#[derive(Clone, RustcDecodable)]
 struct Args {
     arg_input: Option<String>,
     arg_outdir: String,
@@ -85,8 +85,8 @@ impl Args {
 
     fn parallel_split(&self, idx: Indexed<io::File, io::File>)
                      -> CliResult<()> {
-        use std::comm::channel;
         use std::sync::TaskPool;
+        use std::sync::mpsc::channel;
 
         let nchunks = util::num_of_chunks(idx.count() as uint, self.flag_size);
         let pool = TaskPool::new(self.njobs());
@@ -107,7 +107,7 @@ impl Args {
                     wtr.write(row.into_iter()).unwrap();
                 }
                 wtr.flush().unwrap();
-                tx.send(());
+                tx.send(()).unwrap();
             });
         }
         drop(tx);