Stop using span hack for contracts feature gating#136835

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

compiler-errors:contracts-span-hackcompiler-errors/rust:contracts-span-hackCopy head branch name to clipboard