Reduce amount of function pointers in query invocation.#85154

bors merged 2 commits intorust-lang:masterrust-lang/rust:masterfrom

cjgillot:lessfncjgillot/rust:lessfnCopy head branch name to clipboard