Rollup merge of #29613 - steveklabnik:29506, r=alexcrichton
Rollup merge of #29613 - steveklabnik:29506, r=alexcrichton

in favor of just expect()

Fixes #29506

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