Rollup merge of #126035 - oli-obk:query_macro_errors, r=fmease

Some minor query system cleanups

* Improves diagnostics on conflicting query flags
* removes unnecessary impls
* `track_caller`

pulled out of rust-lang/rust#115613