Auto merge of #152516 - nnethercote:mv-query-system-code-3, r=Zalathar

Move `rustc_query_system` code, part 3

Following on from rust-lang/rust#152419.

r? @Zalathar