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