update for rustc 21d1f4d7c