resolve: Use primitives for conditional mutability more consistently#147539

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

petrochenkov:cmresolvepetrochenkov/rust:cmresolveCopy head branch name to clipboard