Fix clippy findings for Rust 1.74 (#1030)

* Fix dijkstra's error occurrences * Fix clippy in score.rs
Qiskit · Nov 21, 2023 · 641f0f9 · 641f0f9
1 parent dc617e9
commit 641f0f9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/rustworkx-core/src/shortest_path/dijkstra.rs b/rustworkx-core/src/shortest_path/dijkstra.rs
@@ -117,8 +117,8 @@ where
     let zero_score = K::default();
     scores.put_item(start, zero_score);
     visit_next.push(MinScored(zero_score, start));
-    if path.is_some() {
-        path.as_mut().unwrap().insert(start, vec![start]);
+    if let Some(path_mut) = &mut path {
+        path_mut.insert(start, vec![start]);
     }
     while let Some(MinScored(node_score, node)) = visit_next.pop() {
         if visited.is_visited(&node) {
@@ -139,10 +139,10 @@ where
                     if next_score < *current_score {
                         scores.put_item(next, next_score);
                         visit_next.push(MinScored(next_score, next));
-                        if path.is_some() {
-                            let mut node_path = path.as_mut().unwrap().get(&node).unwrap().clone();
+                        if let Some(path_mut) = &mut path {
+                            let mut node_path = path_mut.get(&node).unwrap().clone();
                             node_path.push(next);
-                            path.as_mut().unwrap().entry(next).and_modify(|new_vec| {
+                            path_mut.entry(next).and_modify(|new_vec| {
                                 *new_vec = node_path;
                             });
                         }
@@ -151,10 +151,10 @@ where
                 None => {
                     scores.put_item(next, next_score);
                     visit_next.push(MinScored(next_score, next));
-                    if path.is_some() {
-                        let mut node_path = path.as_mut().unwrap().get(&node).unwrap().clone();
+                    if let Some(path_mut) = &mut path {
+                        let mut node_path = path_mut.get(&node).unwrap().clone();
                         node_path.push(next);
-                        path.as_mut().unwrap().entry(next).or_insert(node_path);
+                        path_mut.entry(next).or_insert(node_path);
                     }
                 }
             }

diff --git a/src/score.rs b/src/score.rs
@@ -10,7 +10,7 @@
 // License for the specific language governing permissions and limitations
 // under the License.
 #![allow(clippy::derive_partial_eq_without_eq)]
-#![allow(clippy::incorrect_partial_ord_impl_on_ord_type)]
+#![allow(clippy::non_canonical_partial_ord_impl)]
 
 use std::cmp::Ordering;
 use std::ops::{Add, AddAssign};