Fix building with current rust
auto merge of #447 : dotdash/cargo/rustup, r=alexcrichton