Upgrade to latest Rust

- Rename std::io to std::old_io

Cargo.lock

@@ -4,7 +4,7 @@ version = "0.1.0"
 dependencies = [
  "ansi_term 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "getopts 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "git2 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "git2 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "natord 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "number_prefix 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "users 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -15,8 +15,8 @@ name = "ansi_term"
 version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "regex 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex_macros 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex_macros 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -31,23 +31,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "git2"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bitflags 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libgit2-sys 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libgit2-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "libgit2-sys"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libssh2-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libssh2-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "libz-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -60,12 +60,12 @@ dependencies = [
 
 [[package]]
 name = "libssh2-sys"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libz-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "openssl-sys 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "openssl-sys 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -73,7 +73,7 @@ name = "libz-sys"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "pkg-config 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -93,16 +93,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "openssl-sys"
-version = "0.2.17"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libressl-pnacl-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "pkg-config"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -112,20 +112,20 @@ source = "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 = "regex_macros"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "regex 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.11 (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]]
@@ -134,7 +134,7 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "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]]

src/dir.rs

@@ -1,4 +1,4 @@
-use std::io::{fs, IoResult};
+use std::old_io::{fs, IoResult};
 use file::{File, GREY};
 
 #[cfg(feature="git")] use ansi_term::ANSIString;

src/file.rs

@@ -1,5 +1,5 @@
-use std::io::{fs, IoResult};
-use std::io;
+use std::old_io::{fs, IoResult};
+use std::old_io as io;
 use std::ascii::AsciiExt;
 
 use ansi_term::{ANSIString, Colour, Style};
@@ -397,7 +397,7 @@ fn ext<'a>(name: &'a str) -> Option<String> {
 pub mod test {
     pub use super::*;
     pub use column::{Cell, Column};
-    pub use std::io;
+    pub use std::old_io as io;
     pub use users::{User, Group};
     pub use users::mock::MockUsers;
 

src/filetype.rs

@@ -1,7 +1,7 @@
 use file::{File, GREY};
 use self::FileType::*;
 
-use std::io;
+use std::old_io as io;
 
 use ansi_term::Style;
 use ansi_term::Style::Plain;

src/main.rs

@@ -8,8 +8,7 @@ extern crate users;
 #[cfg(feature="git")]
 extern crate git2;
 
-use std::io::FileType;
-use std::io::fs;
+use std::old_io::{fs, FileType};
 use std::os::{args, set_exit_status};
 
 use dir::Dir;