[beta-1.69] backport #11824#11863

bors merged 1 commit into

rust-lang:rust-1.69.0rust-lang/cargo:rust-1.69.0from

weihanglo:rust-1.69.0weihanglo/cargo:rust-1.69.0Copy head branch name to clipboard