[beta-1.68] Backport fixes#11674

bors merged 2 commits intorust-lang:rust-1.68.0rust-lang/cargo:rust-1.68.0from

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