Rollup merge of #29619 - steveklabnik:gh28824, r=alexcrichton
Rollup merge of #29619 - steveklabnik:gh28824, r=alexcrichton

Fixes #28824

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