Clean up query macros for cache_on_disk_if#151943

rust-bors[bot] merged 1 commit intorust-lang:mainrust-lang/rust:mainfrom

Zalathar:cache-on-diskZalathar/rust:cache-on-diskCopy head branch name to clipboard