update for rust 0.5