Merge pull request #22339 from jefferyto/rust-build-performance