updated to compile w/ latest Rust master