added assertions to make sure the path code is correct in graphs

rust-lang · Sep 19, 2023 · 2284b7a · 2284b7a
1 parent 245e69c
commit 2284b7a
Showing 1 changed file with 27 additions and 0 deletions.
diff --git a/src/cargo/util/graph.rs b/src/cargo/util/graph.rs
@@ -106,6 +106,18 @@ impl<N: Eq + Ord + Clone, E: Default + Clone> Graph<N, E> {
             result.push(p);
             pkg = p.0;
         }
+        #[cfg(debug_assertions)]
+        {
+            for x in result.windows(2) {
+                let [(n1, _), (n2, Some(e12))] = x else {
+                    unreachable!()
+                };
+                assert!(std::ptr::eq(self.edge(n1, n2).unwrap(), *e12));
+            }
+            let last = result.last().unwrap().0;
+            // fixme: this may be wrong when there are cycles, but we dont have them in tests.
+            assert!(!self.nodes.contains_key(last));
+        }
         result
     }
 
@@ -134,6 +146,21 @@ impl<N: Eq + Ord + Clone, E: Default + Clone> Graph<N, E> {
             result.push(p);
             pkg = p.0;
         }
+        #[cfg(debug_assertions)]
+        {
+            for x in result.windows(2) {
+                let [(n2, _), (n1, Some(e12))] = x else {
+                    unreachable!()
+                };
+                assert!(std::ptr::eq(self.edge(n1, n2).unwrap(), *e12));
+            }
+            let last = result.last().unwrap().0;
+            // fixme: this may be wrong when there are cycles, but we dont have them in tests.
+            assert!(!self
+                .nodes
+                .iter()
+                .any(|(_, adjacent)| adjacent.contains_key(last)));
+        }
         result
     }
 }