rustup

Merge after string-cache's rustup.