Work around a resolve bug in const prop#67631

bors merged 4 commits into

rust-lang:masterrust-lang/rust:masterfrom

oli-obk:polymorphic_promotionoli-obk/rust:polymorphic_promotionCopy head branch name to clipboard