partial update to rust 0.8