Rollup merge of #48259 - tinaun:patch-1, r=alexcrichton
Rollup merge of #48259 - tinaun:patch-1, r=alexcrichton

Fixes #47311.
r? @nrc

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