Upgrade Rust

Merged upstream and fixed up makefile.