Auto merge of #4178 - matthiaskrgr:rustup_6, r=oli-obk
Auto merge of #4178 - matthiaskrgr:rustup_6, r=oli-obk

rustup https://github.com/rust-lang/rust/pull/57428/

changelog: none

aidancully/rust,graydon/rust,aidancully/rust,aidancully/rust,aidancully/rust,graydon/rust,graydon/rust,graydon/rust,graydon/rust,graydon/rust,aidancully/rust,aidancully/rust