Updated to latest Rust: PartialEq, PartialOrd