upstream rust changes, fix warnings