update iterator types and fn pointers to Rust master

Is this a permanent change? It looks ridiculous.