Update to new iter names to fix building with current rustc
auto merge of #584 : dotdash/cargo/rustup, r=alexcrichton