Auto merge of #3455 - alexcrichton:bump2, r=alexcrichton

Bump crates-io to 0.5

Author: bors

Cargo.lock

@@ -18,7 +18,7 @@ path = "src/cargo/lib.rs"
 
 [dependencies]
 advapi32-sys = "0.2"
-crates-io = { path = "src/crates-io", version = "0.4" }
+crates-io = { path = "src/crates-io", version = "0.5" }
 crossbeam = "0.2"
 curl = "0.4"
 docopt = "0.6"

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "crates-io"
-version = "0.4.0"
+version = "0.5.0"
 authors = ["Alex Crichton <[email protected]>"]
 license = "MIT/Apache-2.0"
 repository = "https://github.com/rust-lang/cargo"

src/crates-io/Cargo.toml

@@ -7,6 +7,9 @@ use hamcrest::assert_that;
 
 #[test]
 fn check_success() {
+    if !is_nightly() {
+        return
+    }
     let foo = project("foo")
         .file("Cargo.toml", r#"
             [package]
@@ -35,13 +38,15 @@ fn check_success() {
         "#);
     bar.build();
 
-    let expected = if is_nightly() { 0 } else { 101 };
     assert_that(foo.cargo_process("check"),
-                execs().with_status(expected));
+                execs().with_status(0));
 }
 
 #[test]
 fn check_fail() {
+    if !is_nightly() {
+        return
+    }
     let foo = project("foo")
         .file("Cargo.toml", r#"
             [package]
@@ -76,6 +81,9 @@ fn check_fail() {
 
 #[test]
 fn custom_derive() {
+    if !is_nightly() {
+        return
+    }
     let foo = project("foo")
         .file("Cargo.toml", r#"
             [package]
@@ -128,9 +136,8 @@ pub fn derive(_input: TokenStream) -> TokenStream {
 "#);
     bar.build();
 
-    let expected = if is_nightly() { 0 } else { 101 };
     assert_that(foo.cargo_process("check"),
-                execs().with_status(expected));
+                execs().with_status(0));
 }
 
 #[test]