Update for https://github.com/rust-lang/rust/pull/68764 and https://github.com/rust-lang/rust/pull/68788 and https://github.com/rust-lang/rust/pull/69023 and https://github.com/rust-lang/rust/pull/68728
Update for rust-lang/rust#68764 and rust-lang/rust#68788 and rust-lang/rust#69023 and rust-lang/rust#68728