Code cleanups following up on #65576.#65681

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

sunfishcode:followupsunfishcode/rust:followupCopy head branch name to clipboard