More Rust version updates

macos.rs changes are untested.