Use a lighter dedup guard in the assert_instr test shims.#1211

Amanieu merged 2 commits intorust-lang:masterrust-lang/stdarch:masterfrom

hkratz:lighter_dedup_guardhkratz/stdarch:lighter_dedup_guardCopy head branch name to clipboard