Prevent double panic in query system, improve diagnostics#129271

bors merged 1 commit intorust-lang:masterrust-lang/rust:masterfrom

futile:query-system/prevent-double-panicfutile/rust:query-system/prevent-double-panicCopy head branch name to clipboard