diff --git a/Cargo.lock b/Cargo.lock index 6e572b30617..5cef0e23d7d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3,26 +3,26 @@ name = "cargo" version = "0.1.0" dependencies = [ "advapi32-sys 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "curl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "docopt 0.6.39 (registry+https://github.com/rust-lang/crates.io-index)", + "curl 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "docopt 0.6.45 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "flate2 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "git2 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "git2-curl 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glob 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "glob 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "hamcrest 0.1.0 (git+https://github.com/carllerche/hamcrest-rust.git)", "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", "registry 0.1.0", - "rustc-serialize 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "semver 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "semver 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "tar 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "term 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", - "threadpool 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "threadpool 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -41,33 +41,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "curl" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "curl-sys 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "curl-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "curl-sys" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "docopt" -version = "0.6.39" +version = "0.6.45" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "regex 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -76,7 +77,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -88,11 +89,6 @@ dependencies = [ "miniz-sys 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "gcc" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "gcc" version = "0.3.1" @@ -105,8 +101,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libgit2-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libgit2-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -114,15 +110,15 @@ name = "git2-curl" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "curl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "curl 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "git2 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", - "url 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "url 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "glob" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -145,13 +141,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "libgit2-sys" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libssh2-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libssh2-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -165,12 +161,12 @@ dependencies = [ [[package]] name = "libssh2-sys" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", + "openssl-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -203,19 +199,15 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.4.3" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "gcc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "gcc 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "libressl-pnacl-sys 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "pkg-config" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "pkg-config" version = "0.3.0" @@ -228,25 +220,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "regex" -version = "0.1.15" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "registry" version = "0.1.0" dependencies = [ - "curl 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "curl 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-serialize" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "semver" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -266,7 +258,7 @@ dependencies = [ [[package]] name = "threadpool" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -283,16 +275,16 @@ name = "toml" version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rustc-serialize 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "url" -version = "0.2.22" +version = "0.2.23" 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.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 7117fc94890..012daed8e55 100644 --- a/Cargo.toml +++ b/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" diff --git a/src/bin/cargo.rs b/src/bin/cargo.rs index d966d003442..c381d728a13 100644 --- a/src/bin/cargo.rs +++ b/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; diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs index 7defa760c6f..e90594d9e4a 100644 --- a/src/cargo/lib.rs +++ b/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; diff --git a/src/cargo/ops/cargo_rustc/custom_build.rs b/src/cargo/ops/cargo_rustc/custom_build.rs index 60f936b16df..628fc7b545d 100644 --- a/src/cargo/ops/cargo_rustc/custom_build.rs +++ b/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) { diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs index 8ff39be6353..b64f4c1512c 100644 --- a/src/cargo/sources/path.rs +++ b/src/cargo/sources/path.rs @@ -88,7 +88,7 @@ impl<'a, 'b> PathSource<'a, 'b> { pub fn list_files(&self, pkg: &Package) -> CargoResult> { 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)) }) diff --git a/src/rustversion.txt b/src/rustversion.txt index 86e833e0e4c..ac5240e643f 100644 --- a/src/rustversion.txt +++ b/src/rustversion.txt @@ -1 +1 @@ -2015-02-27 +2015-03-04 diff --git a/tests/test_cargo_compile_custom_build.rs b/tests/test_cargo_compile_custom_build.rs index b67491f6f8e..03d0dd14297 100644 --- a/tests/test_cargo_compile_custom_build.rs +++ b/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); } diff --git a/tests/tests.rs b/tests/tests.rs index e92077c01bb..d526e975199 100644 --- a/tests/tests.rs +++ b/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;