Rollup merge of #150188 - yotamofek:pr/dogfood-strip-circumfix, r=Kivooeo

Dogfood `strip_circumfix`

cc rust-lang/rust#147946
Truth be told, I expected to find more places where this can be used in the compiler.
Seems cargo, clippy and rustfmt can use this much more frequently, but I'll have to wait (I think?) for the next two-way sync to be able to dogfood it in those repos.