Auto merge of #56455 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum

Stable 1.31.0 release

This also includes a patch to the edition guide inclusion such that it should actually get built. It will need to be forward-ported to master (and beta, but that'll come as master/beta promotion).

cc @rust-lang/release