Upgrade Rust

Merge from upstream and a small makefile change.