rustc: fix test failures after rebase.