Updated to compile against latest Rust