update for upstream rust changes