librustc: Fix merge fallout.