Auto merge of #114054 - oli-obk:cleanups, r=estebank

Split some functions with many arguments into builder pattern functions

r? `@estebank`

This doesn't resolve all of the ones in rustc, mostly because I need to do other cleanups in order to be able to use some builder derives from crates.io

Works around rust-lang/rust#90672 by making `x test rustfmt --bless` format itself instead of testing that it is formatted