Auto merge of #1397 - alexcrichton:update, r=alexcrichton

Continuation of #1384

Author: bors

Cargo.lock

@@ -10,38 +10,34 @@ 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"
-
-[target.i686-pc-windows-gnu.dependencies]
-winapi = "0.1"
-advapi32-sys = "*"
-
-[target.x86_64-pc-windows-gnu.dependencies]
-winapi = "0.1"
-advapi32-sys = "*"
-
-[dev-dependencies.hamcrest]
-git = "https://github.com/carllerche/hamcrest-rust.git"
-
-[dependencies.registry]
-path = "src/registry"
+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"
+registry = { path = "src/registry" }
+
+[target.i686-pc-windows-gnu]
+dependencies = { winapi = "0.1", advapi32-sys = "*" }
+[target.x86_64-pc-windows-gnu]
+dependencies = { winapi = "0.1", advapi32-sys = "*" }
+
+[dev-dependencies]
+tempdir = "0.3"
+hamcrest = { git = "https://github.com/carllerche/hamcrest-rust.git" }
 
 [[bin]]
 name = "cargo"
@@ -50,9 +46,6 @@ doc = false
 
 [[test]]
 name = "tests"
-[[bench]]
-name = "tests"
-path = "tests/tests.rs"
 
 [[test]]
 name = "resolve"

Cargo.toml

@@ -51,17 +51,17 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
     config.shell().set_verbose(options.flag_verbose);
 
     let ops = ops::TestOptions {
-        name: options.flag_bench.as_ref().map(|s| s.as_slice()),
+        name: options.flag_bench.as_ref().map(|s| &s[..]),
         no_run: options.flag_no_run,
         compile_opts: ops::CompileOptions {
             env: "bench",
             config: config,
             jobs: options.flag_jobs,
-            target: options.flag_target.as_ref().map(|s| s.as_slice()),
+            target: options.flag_target.as_ref().map(|s| &s[..]),
             dev_deps: true,
             features: &options.flag_features,
             no_default_features: options.flag_no_default_features,
-            spec: options.flag_package.as_ref().map(|s| s.as_slice()),
+            spec: options.flag_package.as_ref().map(|s| &s[..]),
             lib_only: false,
             exec_engine: None,
         },

src/bin/bench.rs

@@ -62,11 +62,11 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
         env: env,
         config: config,
         jobs: options.flag_jobs,
-        target: options.flag_target.as_ref().map(|t| t.as_slice()),
+        target: options.flag_target.as_ref().map(|t| &t[..]),
         dev_deps: false,
         features: &options.flag_features,
         no_default_features: options.flag_no_default_features,
-        spec: options.flag_package.as_ref().map(|s| s.as_slice()),
+        spec: options.flag_package.as_ref().map(|s| &s[..]),
         lib_only: options.flag_lib,
         exec_engine: None,
     };