Rollup merge of #69150 - nnethercote:68848-follow-up, r=petrochenkov
Rollup merge of #69150 - nnethercote:68848-follow-up, r=petrochenkov

Follow-up to #68848

This PR contains some late changes to #68848 that somehow didn't get included when that PR was merged in a roll-up.

r? @petrochenkov

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