Auto merge of #114938 - flip1995:clippy_backport, r=matthiaskrgr

Clippy backport

r? `@Manishearth`

This is the accompanying PR to rust-lang/rust#114937. This needs to be merged before tomorrow, so that it gets into master, before beta is branched.

The second commit is pretty much an out-of cycle sync, so that we don't get backport-debt for next release cycle right away.

cc `@Mark-Simulacrum` also mentioning you here, to make sure this is included in the beta branching.

Author: bors