Upgrade Rust

This is just a merge from upsream