upstream rust changes