rollup merge of #20317: brson/rust-installer-v2