Rust upgrade for main crate