Make it work with the latest rust