Update for latest rustc