This PR was rebased onto a different main commit. Here's a [range-diff](https://triagebot.infra.rust-lang.org/gh-range-diff/rust-lang/rust/64b72a1fa5449d928d5f553b01a596b78ee255d2..9c60df8dbeccc6f94f738497f97ac7945da32231/80282b130679a654eaa22f028a908c51be53d436..e1e629c148fd98dd1dfab197907d55f222be45da) highlighting what actually changed.

This PR was rebased onto a different main commit. Here's a [range-diff](https://triagebot.infra.rust-lang.org/gh-range-diff/rust-lang/rust/64b72a1fa5449d928d5f553b01a596b78ee255d2..9c60df8dbeccc6f94f738497f97ac7945da32231/80282b130679a654eaa22f028a908c51be53d436..e1e629c148fd98dd1dfab197907d55f222be45da) highlighting what actually changed. *Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.* _Originally posted by @rustbot in https://github.com/rust-lang/rust/pull/153462#issuecomment-4015124866_