update for new closure borrowcheck rules