Rollup merge of #29617 - steveklabnik:gh29591, r=alexcrichton
Rollup merge of #29617 - steveklabnik:gh29591, r=alexcrichton

Fixes #29591

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