Update to rust master

diff --git a/Cargo.lock b/Cargo.lock
index d42aee09389e44b35feae52b4dfa7a68107a09b8..294fcd522054798df9ce8156b472c440c7c0e4b4 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,12 +2,12 @@
 name = "cargo"
 version = "0.0.1-pre"
 dependencies = [
- "docopt 0.6.3 (git+https://github.com/docopt/docopt.rs#da4e1ba9c416afb60999817e69618ab00cc1188a)",
- "docopt_macros 0.6.3 (git+https://github.com/docopt/docopt.rs#da4e1ba9c416afb60999817e69618ab00cc1188a)",
+ "docopt 0.6.3 (git+https://github.com/docopt/docopt.rs#ee3844098f213121ce7dfb32cdbf2512ecba7085)",
+ "docopt_macros 0.6.3 (git+https://github.com/docopt/docopt.rs#ee3844098f213121ce7dfb32cdbf2512ecba7085)",
  "flate2 0.0.1 (git+https://github.com/alexcrichton/flate2-rs#a59b2a103642550bc1500c302c5031479ec7d9e1)",
- "git2 0.0.1 (git+https://github.com/alexcrichton/git2-rs#89ccd9e9413876d89b0da451e4e7372bb623f344)",
- "glob 0.0.1 (git+https://github.com/rust-lang/glob#88738e0c5ab490b5a9f5e645cf83e4ba043ad1d2)",
- "hamcrest 0.1.0 (git+https://github.com/carllerche/hamcrest-rust.git#f0fd1546b0a7a278a12658ab8602b5c827cc3a42)",
+ "git2 0.0.1 (git+https://github.com/alexcrichton/git2-rs#d36102579e8e42b275f63bf606a7a2eac006a98c)",
+ "glob 0.0.1 (git+https://github.com/rust-lang/glob#ce24c37f268c4a31238dbe3b8e9ff8fe5342f0be)",
+ "hamcrest 0.1.0 (git+https://github.com/carllerche/hamcrest-rust.git#49061a2134d9112b8622d54587590f324b97cc98)",
  "semver 0.0.1 (git+https://github.com/rust-lang/semver#df163f7b22686493b037eee1f1f9d1a2742f9bbe)",
  "tar 0.0.1 (git+https://github.com/alexcrichton/tar-rs#b2391703d54afd20c999d5531c4ed46bcf366f23)",
  "toml 0.1.0 (git+https://github.com/alexcrichton/toml-rs#d40724ad2d6516d7b6750515153b4c360d63afe9)",
@@ -17,14 +17,14 @@ dependencies = [
 [[package]]
 name = "docopt"
 version = "0.6.3"
-source = "git+https://github.com/docopt/docopt.rs#da4e1ba9c416afb60999817e69618ab00cc1188a"
+source = "git+https://github.com/docopt/docopt.rs#ee3844098f213121ce7dfb32cdbf2512ecba7085"
 
 [[package]]
 name = "docopt_macros"
 version = "0.6.3"
-source = "git+https://github.com/docopt/docopt.rs#da4e1ba9c416afb60999817e69618ab00cc1188a"
+source = "git+https://github.com/docopt/docopt.rs#ee3844098f213121ce7dfb32cdbf2512ecba7085"
 dependencies = [
- "docopt 0.6.3 (git+https://github.com/docopt/docopt.rs#da4e1ba9c416afb60999817e69618ab00cc1188a)",
+ "docopt 0.6.3 (git+https://github.com/docopt/docopt.rs#ee3844098f213121ce7dfb32cdbf2512ecba7085)",
 ]
 
 [[package]]
@@ -40,46 +40,46 @@ source = "git+https://github.com/alexcrichton/flate2-rs#a59b2a103642550bc1500c30
 [[package]]
 name = "git2"
 version = "0.0.1"
-source = "git+https://github.com/alexcrichton/git2-rs#89ccd9e9413876d89b0da451e4e7372bb623f344"
+source = "git+https://github.com/alexcrichton/git2-rs#d36102579e8e42b275f63bf606a7a2eac006a98c"
 dependencies = [
- "libgit2 0.0.1 (git+https://github.com/alexcrichton/git2-rs#89ccd9e9413876d89b0da451e4e7372bb623f344)",
+ "libgit2 0.0.1 (git+https://github.com/alexcrichton/git2-rs#d36102579e8e42b275f63bf606a7a2eac006a98c)",
  "url 0.1.0 (git+https://github.com/servo/rust-url#bfdf809365600a7941a77524f9bb065886de3379)",
 ]
 
 [[package]]
 name = "glob"
 version = "0.0.1"
-source = "git+https://github.com/rust-lang/glob#88738e0c5ab490b5a9f5e645cf83e4ba043ad1d2"
+source = "git+https://github.com/rust-lang/glob#ce24c37f268c4a31238dbe3b8e9ff8fe5342f0be"
 
 [[package]]
 name = "hamcrest"
 version = "0.1.0"
-source = "git+https://github.com/carllerche/hamcrest-rust.git#f0fd1546b0a7a278a12658ab8602b5c827cc3a42"
+source = "git+https://github.com/carllerche/hamcrest-rust.git#49061a2134d9112b8622d54587590f324b97cc98"
 
 [[package]]
 name = "libgit2"
 version = "0.0.1"
-source = "git+https://github.com/alexcrichton/git2-rs#89ccd9e9413876d89b0da451e4e7372bb623f344"
+source = "git+https://github.com/alexcrichton/git2-rs#d36102579e8e42b275f63bf606a7a2eac006a98c"
 dependencies = [
- "libssh2-static-sys 0.0.1 (git+https://github.com/alexcrichton/libssh2-static-sys#d6fb271a309c9bcbe8f0992967272e7a765ff735)",
- "link-config 0.0.1 (git+https://github.com/alexcrichton/link-config#e378605ce4099008b1dab8f39619d91dc8887946)",
- "openssl-static-sys 0.0.1 (git+https://github.com/alexcrichton/openssl-static-sys#b8f2500c39932e9d022dcc2590493ab0cc144e2a)",
+ "libssh2-static-sys 0.0.1 (git+https://github.com/alexcrichton/libssh2-static-sys#6a5d3ad7b62db6ca0721c528402f4976a1876036)",
+ "link-config 0.0.1 (git+https://github.com/alexcrichton/link-config#1d3cd271612036b47c015a55f33a97e1524569ae)",
+ "openssl-static-sys 0.0.1 (git+https://github.com/alexcrichton/openssl-static-sys#6fd904b03be4ee9d0e60fbae8e4137836ed74940)",
 ]
 
 [[package]]
 name = "libssh2-static-sys"
 version = "0.0.1"
-source = "git+https://github.com/alexcrichton/libssh2-static-sys#d6fb271a309c9bcbe8f0992967272e7a765ff735"
+source = "git+https://github.com/alexcrichton/libssh2-static-sys#6a5d3ad7b62db6ca0721c528402f4976a1876036"
 
 [[package]]
 name = "link-config"
 version = "0.0.1"
-source = "git+https://github.com/alexcrichton/link-config#e378605ce4099008b1dab8f39619d91dc8887946"
+source = "git+https://github.com/alexcrichton/link-config#1d3cd271612036b47c015a55f33a97e1524569ae"
 
 [[package]]
 name = "openssl-static-sys"
 version = "0.0.1"
-source = "git+https://github.com/alexcrichton/openssl-static-sys#b8f2500c39932e9d022dcc2590493ab0cc144e2a"
+source = "git+https://github.com/alexcrichton/openssl-static-sys#6fd904b03be4ee9d0e60fbae8e4137836ed74940"
 
 [[package]]
 name = "semver"

diff --git a/src/bin/cargo.rs b/src/bin/cargo.rs
index 140f2d26da8d670c3e93732b2022b1eac65977b7..e659f93f04e5117cc57b17232fc73c2c1f976398 100644 (file)
--- a/src/bin/cargo.rs
+++ b/src/bin/cargo.rs
@@ -10,7 +10,7 @@ extern crate docopt;
 use std::collections::TreeSet;
 use std::os;
 use std::io;
-use std::io::fs;
+use std::io::fs::{mod, PathExtensions};
 use std::io::process::{Command,InheritFd,ExitStatus,ExitSignal};
 use docopt::FlagParser;
 

diff --git a/src/cargo/ops/cargo_clean.rs b/src/cargo/ops/cargo_clean.rs
index 44c64ff846bb55e87ddbb748098c97c762d1a433..d8362f23bbcb76fc17c99754a3a258ce0138a83b 100644 (file)
--- a/src/cargo/ops/cargo_clean.rs
+++ b/src/cargo/ops/cargo_clean.rs
@@ -1,4 +1,4 @@
-use std::io::fs::{rmdir_recursive};
+use std::io::fs::{rmdir_recursive, PathExtensions};
 
 use core::source::Source;
 use sources::PathSource;

diff --git a/src/cargo/ops/cargo_new.rs b/src/cargo/ops/cargo_new.rs
index d74e381e1d89bd0291248488393e4759fe1c5888..97b1a4ce8007c2d098151c3e8f2931de6ba3862b 100644 (file)
--- a/src/cargo/ops/cargo_new.rs
+++ b/src/cargo/ops/cargo_new.rs
@@ -1,5 +1,6 @@
 use std::os;
 use std::io::{mod, fs, File};
+use std::io::fs::PathExtensions;
 
 use git2::{Repository, Config};
 

diff --git a/src/cargo/ops/cargo_package.rs b/src/cargo/ops/cargo_package.rs
index b5c7187934db4f71ea4921f929debbefba69e318..5e25d3e44cff3f4f45a789793f61ae88e571485f 100644 (file)
--- a/src/cargo/ops/cargo_package.rs
+++ b/src/cargo/ops/cargo_package.rs
@@ -1,4 +1,5 @@
 use std::io::File;
+use std::io::fs::PathExtensions;
 
 use tar::Archive;
 use flate2::{GzBuilder, BestCompression};

diff --git a/src/cargo/ops/cargo_read_manifest.rs b/src/cargo/ops/cargo_read_manifest.rs
index a3799957a8585ef5c800d044424467d15bef5e0e..a52f98df0cfe5a8de80cc8b05d5c46f7eebd3ce7 100644 (file)
--- a/src/cargo/ops/cargo_read_manifest.rs
+++ b/src/cargo/ops/cargo_read_manifest.rs
@@ -1,5 +1,7 @@
 use std::collections::HashSet;
 use std::io::{File, fs};
+use std::io::fs::PathExtensions;
+
 use core::{Package,Manifest,SourceId};
 use util::{mod, CargoResult, human};
 use util::important_paths::find_project_manifest_exact;

diff --git a/src/cargo/ops/cargo_rustc/layout.rs b/src/cargo/ops/cargo_rustc/layout.rs
index 0e612f33d49ee67d74b2b4bba046c32b0d528dc8..59025ed6659426e00fcee991b8187889cfb9c4ef 100644 (file)
--- a/src/cargo/ops/cargo_rustc/layout.rs
+++ b/src/cargo/ops/cargo_rustc/layout.rs
@@ -47,6 +47,7 @@
 //! ```
 
 use std::io::{mod, fs, IoResult};
+use std::io::fs::PathExtensions;
 
 use core::Package;
 use util::hex::short_hash;

diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs
index dc917bdd1a6a17d1fbd05c0661659cbde71c1091..d53736aa4f71301a413a7312f7bfa01f581ffe1a 100644 (file)
--- a/src/cargo/ops/cargo_rustc/mod.rs
+++ b/src/cargo/ops/cargo_rustc/mod.rs
@@ -1,6 +1,7 @@
 use std::collections::HashSet;
 use std::dynamic_lib::DynamicLibrary;
 use std::io::{fs, UserRWX};
+use std::io::fs::PathExtensions;
 use std::os;
 
 use core::{SourceMap, Package, PackageId, PackageSet, Target, Resolve};

diff --git a/src/cargo/sources/git/utils.rs b/src/cargo/sources/git/utils.rs
index 3ecefda38cf9c546880cd7a8f39e43a370163015..03a2ab0e006e6537c9ac071f9e31824f0948053c 100644 (file)
--- a/src/cargo/sources/git/utils.rs
+++ b/src/cargo/sources/git/utils.rs
@@ -1,7 +1,7 @@
 use std::fmt::{mod, Show, Formatter};
 use std::io::{UserDir};
-use std::io::fs::{mkdir_recursive,rmdir_recursive};
-use serialize::{Encodable,Encoder};
+use std::io::fs::{mkdir_recursive, rmdir_recursive, PathExtensions};
+use serialize::{Encodable, Encoder};
 use url::Url;
 use git2;
 

diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs
index ecaf541439aaefe727d524d0357ad7c9a6fb54c7..a082197e675fa608d47b74c922e06d253999a6a6 100644 (file)
--- a/src/cargo/sources/path.rs
+++ b/src/cargo/sources/path.rs
@@ -1,6 +1,6 @@
 use std::cmp;
 use std::fmt::{mod, Show, Formatter};
-use std::io::fs;
+use std::io::fs::{mod, PathExtensions};
 use glob::Pattern;
 use git2;
 

diff --git a/src/cargo/util/config.rs b/src/cargo/util/config.rs
index eb3ad0aca79c1aedef72d4abcb7d9eefd86e930a..481981c0e1a170a5d0a35f5a63310853404d8714 100644 (file)
--- a/src/cargo/util/config.rs
+++ b/src/cargo/util/config.rs
@@ -1,4 +1,5 @@
 use std::{io, fmt, os, result, mem};
+use std::io::fs::PathExtensions;
 use std::collections::HashMap;
 use serialize::{Encodable,Encoder};
 use toml;

diff --git a/src/cargo/util/important_paths.rs b/src/cargo/util/important_paths.rs
index b7604d51c53a63b53f571f7eaf8b741cadbb68b9..bcbe22abfbdb408c43d5ded09837d55247e05077 100644 (file)
--- a/src/cargo/util/important_paths.rs
+++ b/src/cargo/util/important_paths.rs
@@ -1,4 +1,5 @@
 use std::os;
+use std::io::fs::PathExtensions;
 use util::{CargoResult, CliError, CliResult, human};
 
 /// Iteratively search for `file` in `pwd` and its parents, returning

diff --git a/src/cargo/util/toml.rs b/src/cargo/util/toml.rs
index c90d318830413cc6a8719f58df9ef18a4603de0f..fcc2bb394f465ed26b56fe8f9d5aafc751dc5676 100644 (file)
--- a/src/cargo/util/toml.rs
+++ b/src/cargo/util/toml.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 use std::fmt;
-use std::io::fs;
+use std::io::fs::{mod, PathExtensions};
 use std::os;
 use std::slice;
 use std::str;

diff --git a/tests/support/mod.rs b/tests/support/mod.rs
index 9b0feb865865d04f4185dc22518ed716ba33c377..e257a28d67a1a2ee1834a2f953de6bdfbf7e4d47 100644 (file)
--- a/tests/support/mod.rs
+++ b/tests/support/mod.rs
@@ -1,5 +1,5 @@
 use std::io;
-use std::io::fs;
+use std::io::fs::{mod, PathExtensions};
 use std::io::process::{ProcessOutput};
 use std::os;
 use std::path::{Path,BytesContainer};

diff --git a/tests/support/paths.rs b/tests/support/paths.rs
index f14f1d03ab0db0f78eef1689bcc097fcab5ec7d1..8acdc83e7c61294e7a0dc3ac41d67727b2c4151a 100644 (file)
--- a/tests/support/paths.rs
+++ b/tests/support/paths.rs
@@ -1,5 +1,5 @@
 use std::io::IoResult;
-use std::io::fs;
+use std::io::fs::{mod, PathExtensions};
 use std::sync::atomics;
 use std::{io, os};
 

diff --git a/tests/test_cargo.rs b/tests/test_cargo.rs
index 8e1f43270acbbcba559778b633c9aedb75b20194..cb5334c6be632656c8a5daa05bfe6145b592a6b8 100644 (file)
--- a/tests/test_cargo.rs
+++ b/tests/test_cargo.rs
@@ -1,4 +1,4 @@
-use std::io::fs;
+use std::io::fs::{mod, PathExtensions};
 use std::io;
 use std::os;
 use std::str;

diff --git a/tests/test_cargo_compile.rs b/tests/test_cargo_compile.rs
index af390469d79ac73c55e0666cbfabf84f9af87abb..5809dc331da5be67fa48a64e83853316f6daebe0 100644 (file)
--- a/tests/test_cargo_compile.rs
+++ b/tests/test_cargo_compile.rs
@@ -790,6 +790,7 @@ test!(custom_build_env_vars {
         "#)
         .file("src/foo.rs", format!(r#"
             use std::os;
+            use std::io::fs::PathExtensions;
             fn main() {{
                 let _ncpus = os::getenv("NUM_JOBS").unwrap();
                 let out = os::getenv("OUT_DIR").unwrap();

diff --git a/tests/test_cargo_compile_git_deps.rs b/tests/test_cargo_compile_git_deps.rs
index c50a255d6ff20039c2c40be054eaea5efa4949d2..6c5b26d25b737d891a57736348a77015d309b047 100644 (file)
--- a/tests/test_cargo_compile_git_deps.rs
+++ b/tests/test_cargo_compile_git_deps.rs
@@ -1,4 +1,5 @@
 use std::io::{timer, fs, File};
+use std::io::fs::PathExtensions;
 use std::time::Duration;
 
 use support::{ProjectBuilder, ResultTest, project, execs, main_file, paths};

diff --git a/tests/test_cargo_new.rs b/tests/test_cargo_new.rs
index 47a3f6e6b48da52746ee23a722b69791c1ad3dc7..61b6936027a76936d55fd08072fcc1da567abf05 100644 (file)
--- a/tests/test_cargo_new.rs
+++ b/tests/test_cargo_new.rs
@@ -1,4 +1,5 @@
 use std::io::{fs, UserRWX, File};
+use std::io::fs::PathExtensions;
 use std::os;
 
 use support::{execs, paths, cargo_dir, ResultTest};