upstream rust changes; clear out some warnings