Updated to rust nightly 2015-03-04

Cargo.toml

@@ -10,24 +10,24 @@ name = "cargo"
 path = "src/cargo/lib.rs"
 
 [dependencies]
-toml = "0.1"
-semver = "0.1"
-curl = "0.2"
-tar = "0.2"
-flate2 = "0.2"
-git2 = "0.2"
-git2-curl = "0.2"
-glob = "0.2"
-time = "0.1"
-log = "0.2"
-env_logger = "0.2"
-docopt = "0.6"
-url = "0.2"
-rustc-serialize = "0.3"
-term = "0.1"
-regex = "0.1"
-threadpool = "0.1"
-libc = "0.1"
+toml = "0.1.18"
+semver = "0.1.16"
+curl = "0.2.2"
+tar = "0.2.3"
+flate2 = "0.2.0"
+git2 = "0.2.1"
+git2-curl = "0.2.1"
+glob = "0.2.2"
+time = "0.1.19"
+log = "0.2.5"
+env_logger = "0.2.2"
+docopt = "0.6.45"
+url = "0.2.23"
+rustc-serialize = "0.3.1"
+term = "0.1.13"
+regex = "0.1.18"
+threadpool = "0.1.1"
+libc = "0.1.2"
 
 [target.i686-pc-windows-gnu.dependencies]
 winapi = "0.1"

src/bin/cargo.rs

@@ -1,4 +1,4 @@
-#![feature(collections, core, io, path, process, fs, env, std_misc, os, old_io)]
+#![feature(collections, core, io, path, fs, std_misc, os, old_io, exit_status)]
 
 extern crate "git2-curl" as git2_curl;
 extern crate "rustc-serialize" as rustc_serialize;

src/cargo/lib.rs

@@ -1,6 +1,6 @@
 #![deny(unused)]
-#![feature(collections, hash, os, std_misc, unicode, env, core)]
-#![feature(io, path, str_words, process, fs, old_io)]
+#![feature(collections, hash, os, std_misc, unicode, core)]
+#![feature(io, path, str_words, fs, old_io, exit_status)]
 #![cfg_attr(test, deny(warnings))]
 
 #[cfg(test)] extern crate hamcrest;

src/cargo/ops/cargo_rustc/custom_build.rs

@@ -260,7 +260,7 @@ impl BuildOutput {
         let whence = format!("build script of `{}`", pkg_name);
 
         for line in input.lines() {
-            let mut iter = line.splitn(1, |&: c: char| c == ':');
+            let mut iter = line.splitn(1, |c| c == ':');
             if iter.next() != Some("cargo") {
                 // skip this line since it doesn't start with "cargo:"
                 continue;
@@ -271,7 +271,7 @@ impl BuildOutput {
             };
 
             // getting the `key=value` part of the line
-            let mut iter = data.splitn(1, |&: c: char| c == '=');
+            let mut iter = data.splitn(1, |c| c == '=');
             let key = iter.next();
             let value = iter.next();
             let (key, value) = match (key, value) {

src/cargo/sources/path.rs

@@ -88,7 +88,7 @@ impl<'a, 'b> PathSource<'a, 'b> {
     pub fn list_files(&self, pkg: &Package) -> CargoResult<Vec<PathBuf>> {
         let root = pkg.root();
 
-        let parse = |&: p: &String| {
+        let parse = |p: &String| {
             Pattern::new(p).map_err(|e| {
                 human(format!("could not parse pattern `{}`: {}", p, e))
             })

src/rustversion.txt

@@ -1 +1 @@
-2015-02-27
+2015-03-04

tests/test_cargo_compile_custom_build.rs

@@ -24,7 +24,7 @@ test!(custom_build_script_failed {
             fn main() {}
         "#)
         .file("build.rs", r#"
-            #![feature(env)]
+            #![feature(exit_status)]
             fn main() {
                 std::env::set_exit_status(101);
             }

tests/tests.rs

@@ -1,5 +1,5 @@
 #![feature(core, io, old_io, os, old_path)]
-#![feature(std_misc, env, io, path, fs, tempdir, process)]
+#![feature(std_misc, io, path, fs, tempdir)]
 
 extern crate "rustc-serialize" as serialize;
 extern crate cargo;