Track Rust master

Fix compile errors on latest Rust nightly.