Rust upgrade: CharEq changes