Upgrade Rust

Merged from upstream and fixed makefiles.