Auto merge of rust-lang#52476 - wesleywiser:categorize_queries, r=nikomatsakis

Categorize queries for later self-profiling

Change the define_queries! macro per feedback on rust-lang#51657.

Big thanks to @mark-i-m for the help getting the macro changes correct!

I'm pulling this commit out of the other PR because it's hard to keep up-to-date as queries are added or changed.

r? @nikomatsakis

Author: bors