Rollup merge of #28765 - steveklabnik:gh28693, r=nikomatsakis
Rollup merge of #28765 - steveklabnik:gh28693, r=nikomatsakis

Fixes #28693

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