Smaller refactor svh#27461

richo wants to merge 1 commit intorust-lang:masterrust-lang/rust:masterfrom

richo:smaller-refactor-svhricho/rust:smaller-refactor-svhCopy head branch name to clipboard