Skip to content

Commit

Permalink
Auto merge of rust-lang#42916 - Mark-Simulacrum:update-cargo, r=alexc…
Browse files Browse the repository at this point in the history 
…richton

Update Cargo

Haven't run extensive tests locally (not really sure what to test) but this primarily pulls in minor changes: rust-lang/cargo#4215, rust-lang/cargo#4209, and rust-lang/cargo#4218. The last one fixes the flaky cargo test by ignoring it, which should unblock rust-lang#42745 -- that's beta nominated.

r? @alexcrichton
  • Loading branch information
@bors
bors committed Jun 26, 2017
2 parents 859c323 + 38b4688 commit 77931c2
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 48 deletions.
Loading

0 comments on commit 77931c2

Please sign in to comment.