Upgrade to latest Rust

Rebased to fix mac errors. Originally part of #733.