WIP update for new rustc