update to recent Rust changes