changes to update to rust 0.12