updated for changes in rust master