Update for latest rust language changes.