rustup

22 files changed, 51 insertions, 52 deletions

diff --git a/Cargo.lock b/Cargo.lock
index a882aef..ecba195 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,56 +2,54 @@
 name = "xsv"
 version = "0.8.18"
 dependencies = [
- "csv 0.12.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "docopt 0.6.31 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "quickcheck 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "csv 0.12.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "docopt 0.6.32 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quickcheck 0.1.32 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "streaming-stats 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "tabwriter 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tabwriter 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "csv"
-version = "0.12.10"
+version = "0.12.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rustc-serialize 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "docopt"
-version = "0.6.31"
+version = "0.6.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "regex 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "log"
-version = "0.1.10"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "regex 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
 name = "quickcheck"
-version = "0.1.30"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "log 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "regex"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "rustc-serialize"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -61,10 +59,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "tabwriter"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "docopt 0.6.31 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "docopt 0.6.32 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-serialize 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 720f6af..c3a235f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,10 +28,11 @@ opt-level = 2
 
 [dependencies]
 csv = "*"
-streaming-stats = "*"
-tabwriter = "*"
 docopt = "*"
+regex = "*"
 rustc-serialize = "*"
+streaming-stats = "*"
+tabwriter = "*"
 
 [dev-dependencies]
 quickcheck = "*"
diff --git a/src/cmd/flatten.rs b/src/cmd/flatten.rs
index a79a0b1..0420b4f 100644
--- a/src/cmd/flatten.rs
+++ b/src/cmd/flatten.rs
@@ -1,4 +1,4 @@
-use std::io;
+use std::old_io as io;
 
 use tabwriter::TabWriter;
 
@@ -67,10 +67,10 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
             if rconfig.no_headers {
                 try!(wtr.write_str(&*i.to_string()));
             } else {
-                try!(wtr.write(&**header));
+                try!(wtr.write_all(&**header));
             }
             try!(wtr.write_u8(b'\t'));
-            try!(wtr.write(&*util::condense(&*field, args.flag_condense)));
+            try!(wtr.write_all(&*util::condense(&*field, args.flag_condense)));
             try!(wtr.write_u8(b'\n'));
         }
     }
diff --git a/src/cmd/frequency.rs b/src/cmd/frequency.rs
index dc29caf..7546add 100644
--- a/src/cmd/frequency.rs
+++ b/src/cmd/frequency.rs
@@ -1,4 +1,4 @@
-use std::io::{self, File};
+use std::old_io as io;
 use std::iter::range;
 use std::os;
 
diff --git a/src/cmd/headers.rs b/src/cmd/headers.rs
index eedccfd..a8c3267 100644
--- a/src/cmd/headers.rs
+++ b/src/cmd/headers.rs
@@ -1,4 +1,4 @@
-use std::io;
+use std::old_io as io;
 
 use tabwriter::TabWriter;
 
@@ -66,7 +66,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
             try!(wtr.write_str(&*(i + 1).to_string()));
             try!(wtr.write_u8(b'\t'));
         }
-        try!(wtr.write(&*header));
+        try!(wtr.write_all(&*header));
         try!(wtr.write_u8(b'\n'));
     }
     try!(wtr.flush());
diff --git a/src/cmd/index.rs b/src/cmd/index.rs
index ef2551f..b679874 100644
--- a/src/cmd/index.rs
+++ b/src/cmd/index.rs
@@ -1,4 +1,4 @@
-use std::io::{BufferedWriter, File};
+use std::old_io::{BufferedWriter, File};
 
 use csv;
 
diff --git a/src/cmd/join.rs b/src/cmd/join.rs
index fa2a7be..e379bd8 100644
--- a/src/cmd/join.rs
+++ b/src/cmd/join.rs
@@ -1,6 +1,6 @@
 use std::collections::hash_map::{HashMap, Entry};
 use std::fmt;
-use std::io;
+use std::old_io as io;
 use std::iter::repeat;
 use std::str;
 
@@ -352,7 +352,7 @@ impl<R: Reader + Seek> ValueIndex<R> {
         if !rdr.has_headers {
             // ... so if there are no headers, we seek to the beginning and
             // index everything.
-            try!(rdr.seek(0, ::std::io::SeekSet));
+            try!(rdr.seek(0, io::SeekSet));
         } else {
             // ... and if there are headers, we make sure that we've parsed
             // them, and write the offset of the header row to the index.
diff --git a/src/cmd/slice.rs b/src/cmd/slice.rs
index b733827..04f4d50 100644
--- a/src/cmd/slice.rs
+++ b/src/cmd/slice.rs
@@ -1,4 +1,4 @@
-use std::io::File;
+use std::old_io::File;
 
 use csv::index::Indexed;
 
diff --git a/src/cmd/split.rs b/src/cmd/split.rs
index a4103a6..010705a 100644
--- a/src/cmd/split.rs
+++ b/src/cmd/split.rs
@@ -1,5 +1,5 @@
-use std::io;
-use std::io::fs::mkdir_recursive;
+use std::old_io as io;
+use std::old_io::fs::mkdir_recursive;
 use std::os;
 
 use csv;
diff --git a/src/cmd/stats.rs b/src/cmd/stats.rs
index 8118c1a..04ea951 100644
--- a/src/cmd/stats.rs
+++ b/src/cmd/stats.rs
@@ -1,7 +1,7 @@
 use std::borrow::ToOwned;
 use std::default::Default;
 use std::fmt;
-use std::io::{self, File};
+use std::old_io as io;
 use std::iter::repeat;
 use std::os;
 use std::str::{self, FromStr};
diff --git a/src/config.rs b/src/config.rs
index c91f414..284676c 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -1,6 +1,6 @@
 use std::ascii::AsciiExt;
 use std::borrow::ToOwned;
-use std::io;
+use std::old_io as io;
 use std::os;
 
 use rustc_serialize::{Decodable, Decoder};
diff --git a/src/main.rs b/src/main.rs
index 2b2b612..6e60e94 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,14 +15,14 @@ extern crate tabwriter;
 use std::borrow::ToOwned;
 use std::error::FromError;
 use std::fmt;
-use std::io;
+use std::old_io as io;
 use std::os;
 
 use docopt::Docopt;
 
 macro_rules! werr {
     ($($arg:tt)*) => (
-        match ::std::io::stderr().write_str(&*format!($($arg)*)) {
+        match ::std::old_io::stderr().write_str(&*format!($($arg)*)) {
             Ok(_) => (),
             Err(err) => panic!("{}", err),
         }
diff --git a/tests/test_cat.rs b/tests/test_cat.rs
index 6491586..62feff8 100644
--- a/tests/test_cat.rs
+++ b/tests/test_cat.rs
@@ -1,4 +1,4 @@
-use std::io::process;
+use std::old_io::process;
 
 use {Csv, CsvData, qcheck};
 use workdir::Workdir;
diff --git a/tests/test_flatten.rs b/tests/test_flatten.rs
index 2bcb993..a7ba9d6 100644
--- a/tests/test_flatten.rs
+++ b/tests/test_flatten.rs
@@ -1,4 +1,4 @@
-use std::io::process;
+use std::old_io::process;
 
 use workdir::Workdir;
 
diff --git a/tests/test_fmt.rs b/tests/test_fmt.rs
index cf05284..addc72b 100644
--- a/tests/test_fmt.rs
+++ b/tests/test_fmt.rs
@@ -1,4 +1,4 @@
-use std::io::process;
+use std::old_io::process;
 
 use workdir::Workdir;
 
diff --git a/tests/test_frequency.rs b/tests/test_frequency.rs
index ee27b54..32b41a6 100644
--- a/tests/test_frequency.rs
+++ b/tests/test_frequency.rs
@@ -1,6 +1,6 @@
 use std::borrow::ToOwned;
 use std::collections::hash_map::{HashMap, Hasher, Entry};
-use std::io::process;
+use std::old_io::process;
 
 use csv;
 use stats::Frequencies;
diff --git a/tests/test_headers.rs b/tests/test_headers.rs
index 4da68a2..0fe31f3 100644
--- a/tests/test_headers.rs
+++ b/tests/test_headers.rs
@@ -1,4 +1,4 @@
-use std::io::process;
+use std::old_io::process;
 
 use workdir::Workdir;
 
diff --git a/tests/test_index.rs b/tests/test_index.rs
index f706dff..32f239e 100644
--- a/tests/test_index.rs
+++ b/tests/test_index.rs
@@ -1,4 +1,4 @@
-use std::io::fs;
+use std::old_io::fs;
 
 use workdir::Workdir;
 
diff --git a/tests/test_join.rs b/tests/test_join.rs
index 9a5f1c3..78c4f6e 100644
--- a/tests/test_join.rs
+++ b/tests/test_join.rs
@@ -5,7 +5,7 @@ use workdir::Workdir;
 macro_rules! join_test {
     ($name:ident, $fun:expr) => (
         mod $name {
-            use std::io::process;
+            use std::old_io::process;
 
             use workdir::Workdir;
             use super::{make_rows, setup};
diff --git a/tests/test_slice.rs b/tests/test_slice.rs
index 417e950..c1a686b 100644
--- a/tests/test_slice.rs
+++ b/tests/test_slice.rs
@@ -1,5 +1,5 @@
 use std::borrow::ToOwned;
-use std::io::process;
+use std::old_io::process;
 
 use workdir::Workdir;
 
diff --git a/tests/test_stats.rs b/tests/test_stats.rs
index 11963a3..9420a17 100644
--- a/tests/test_stats.rs
+++ b/tests/test_stats.rs
@@ -1,5 +1,5 @@
 use std::borrow::ToOwned;
-use std::io::process;
+use std::old_io::process;
 
 use workdir::Workdir;
 
diff --git a/tests/workdir.rs b/tests/workdir.rs
index 3894f43..1e805d6 100644
--- a/tests/workdir.rs
+++ b/tests/workdir.rs
@@ -1,7 +1,7 @@
 use std::fmt;
-use std::io;
-use std::io::fs::{self, PathExtensions};
-use std::io::process;
+use std::old_io as io;
+use std::old_io::fs::{self, PathExtensions};
+use std::old_io::process;
 use std::os;
 use std::str::FromStr;
 use std::sync::atomic;