Auto merge of #7367 - flip1995:backport_remerge, r=flip1995

Remerge Beta backport changes

We do this to keep the Clippy commits that are in rust-lang/rust also in Clippy.

r? `@ghost`

changelog: none

Author: bors