Auto merge of rust-lang#2297 - alexcrichton:update, r=alexcrichton

Just a routine for niche bug fixes, linkage errors, perf improvements, etc.

Closes rust-lang#2295

Author: bors

Cargo.lock

@@ -19,7 +19,7 @@ path = "src/cargo/lib.rs"
 [dependencies]
 advapi32-sys = "0.1"
 crates-io = { path = "src/crates-io", version = "0.1" }
-crossbeam = "0.1"
+crossbeam = "0.2"
 curl = "0.2"
 docopt = "0.6"
 env_logger = "0.3"
@@ -28,16 +28,16 @@ flate2 = "0.2"
 git2 = "0.3"
 git2-curl = "0.3"
 glob = "0.2"
-kernel32-sys = "0.1"
+kernel32-sys = "0.2"
 libc = "0.2"
 libgit2-sys = "0.3"
 log = "0.3"
 num_cpus = "0.2"
 regex = "0.1"
 rustc-serialize = "0.3"
 semver = "0.2.0"
-tar = "0.3"
-term = "0.2"
+tar = "0.4"
+term = "0.4"
 time = "0.1"
 toml = "0.1"
 url = "0.2"

Cargo.toml

@@ -3,7 +3,7 @@ use cargo::util::{CliResult, CliError, Human, Config};
 use cargo::util::important_paths::{find_root_manifest_for_wd};
 
 #[derive(RustcDecodable)]
-struct Options {
+pub struct Options {
     flag_no_run: bool,
     flag_package: Vec<String>,
     flag_jobs: Option<u32>,

src/bin/bench.rs

@@ -6,7 +6,7 @@ use cargo::util::important_paths::{find_root_manifest_for_wd};
 use cargo::util::{CliResult, Config};
 
 #[derive(RustcDecodable)]
-struct Options {
+pub struct Options {
     flag_package: Vec<String>,
     flag_jobs: Option<u32>,
     flag_features: Vec<String>,