Update for new rustc