Upstream Rust changes.