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

* Update dependencies that are getting warnings on nightly * Tweak expected output of failing tests
rust-lang · Aug 21, 2015 · 176b5c1 · 176b5c1
2 parents af1b359 + 959d1a7
commit 176b5c1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tests/test_cargo_test.rs b/tests/test_cargo_test.rs
@@ -212,10 +212,6 @@ test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured
 
 ",
         COMPILING, p.url(), RUNNING))
-              .with_stderr(format!("\
-thread '<main>' panicked at 'Some tests failed', [..]
-
-"))
               .with_status(101));
 });