compiler: Fix a couple issues around cargo feature unification#148341

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

jyn514:feature-unificationjyn514/rust:feature-unificationCopy head branch name to clipboard