librustc: Fix botched merge. rs=merge