Address comments in pull request #51084.#51108

bors merged 1 commit intorust-lang:masterrust-lang/rust:masterfrom

simartin:issue_51022_follow-upsimartin/rust:issue_51022_follow-upCopy head branch name to clipboard