Update to rust master

Continuation of #1077
Closes https://github.com/rust-lang/cargo/pull/1079