From 5fbbe1008473bcc672e3a0bd4719a14110865a95 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Thu, 5 Oct 2023 18:32:00 -0400 Subject: [PATCH] Fix build errors with Rust 1.73.0 (#996) The recent Rust 1.73.0 release introduced some changes to clippy's behavior that are causing failures in CI (and correctly calling out issues in our code). This commit updates the rustworkx source to correct these failures. (cherry picked from commit 651409f403cfd458ab6c92aae0e2a3e6df4b9484) # Conflicts: # src/score.rs --- src/score.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/score.rs b/src/score.rs index 49765ee4e..1437e16c0 100644 --- a/src/score.rs +++ b/src/score.rs @@ -10,7 +10,11 @@ // License for the specific language governing permissions and limitations // under the License. #![allow(clippy::derive_partial_eq_without_eq)] +<<<<<<< HEAD #![allow(clippy::non_canonical_partial_ord_impl)] +======= +#![allow(clippy::incorrect_partial_ord_impl_on_ord_type)] +>>>>>>> 651409f (Fix build errors with Rust 1.73.0 (#996)) use std::cmp::Ordering; use std::ops::{Add, AddAssign};