Auto merge of #1360 - alexcrichton:new-io, r=alexcrichton

cc @aturon, this is one giant commit.

Author: bors

Cargo.lock

@@ -12,20 +12,22 @@ path = "src/cargo/lib.rs"
 [dependencies]
 toml = "0.1"
 semver = "0.1"
-curl = "0.1"
-tar = "0.1"
-flate2 = "0.1"
-git2 = "0.1"
-git2-curl = "0.1"
-glob = "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.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"

Cargo.toml

@@ -70,7 +70,7 @@ $(foreach target,$(CFG_TARGET),$(eval $(call DIST_TARGET,$(target))))
 ifdef CFG_LOCAL_CARGO
 CARGO := $(CFG_LOCAL_CARGO)
 else
-CARGO := $(TARGET_ROOT)/snapshot/bin/cargo$(X)
+CARGO := $(TARGET_ROOT)/snapshot/cargo/bin/cargo$(X)
 endif
 
 all: $(foreach target,$(CFG_TARGET),cargo-$(target))
@@ -82,11 +82,12 @@ cargo-$(1): $$(CARGO)
 	$$(CARGO) build --target $(1) $$(OPT_FLAG) $$(VERBOSE_FLAG) $$(ARGS)
 
 test-unit-$(1): $$(CARGO)
+	@mkdir -p target/$(1)/cit
 	$$(CARGO) test --target $(1) $$(VERBOSE_FLAG) $$(only)
 endef
 $(foreach target,$(CFG_TARGET),$(eval $(call CARGO_TARGET,$(target))))
 
-$(TARGET_ROOT)/snapshot/bin/cargo$(X): src/snapshots.txt
+$(TARGET_ROOT)/snapshot/cargo/bin/cargo$(X): src/snapshots.txt
 	$(CFG_PYTHON) src/etc/dl-snapshot.py $(CFG_BUILD)
 	touch $@
 

Makefile.in

@@ -1,5 +1,3 @@
-use std::old_io::process::ExitStatus;
-
 use cargo::ops;
 use cargo::util::{CliResult, CliError, Human, Config};
 use cargo::util::important_paths::{find_root_manifest_for_cwd};
@@ -76,9 +74,9 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
     match err {
         None => Ok(None),
         Some(err) => {
-            Err(match err.exit {
-                Some(ExitStatus(i)) => CliError::new("", i as i32),
-                _ => CliError::from_boxed(box Human(err), 101)
+            Err(match err.exit.as_ref().and_then(|c| c.code()) {
+                Some(i) => CliError::new("", i),
+                None => CliError::from_error(Human(err), 101)
             })
         }
     }