follow changes in rust master