Disable DfsIter and BfsIter until bug rust-lang/rust#22841 is fixed

rust-lang/rust#22841

Author: root

src/lib.rs

@@ -19,9 +19,7 @@ pub use graph::Graph;
 pub use self::EdgeDirection::{Outgoing, Incoming};
 pub use visit::{
     Bfs,
-    BfsIter,
     Dfs,
-    DfsIter,
 };
 
 mod scored;

src/visit.rs

@@ -257,34 +257,6 @@ impl<N, VM> Dfs<N, VM> where
     }
 }
 
-/// An iterator for a depth first traversal of a graph.
-pub struct DfsIter<'a, G: 'a + Visitable>
-{
-    graph: &'a G,
-    dfs: Dfs<G::NodeId, G::Map>,
-}
-
-impl<'a, G: Visitable> DfsIter<'a, G>
-{
-    pub fn new(graph: &'a G, start: G::NodeId) -> Self
-    {
-        DfsIter {
-            graph: graph,
-            dfs: Dfs::new(graph, start)
-        }
-    }
-}
-
-impl<'a, G: 'a + Visitable> Iterator for DfsIter<'a, G> where
-    G: for<'b> NeighborIter<'b>,
-{
-    type Item = G::NodeId;
-    fn next(&mut self) -> Option<G::NodeId>
-    {
-        self.dfs.next(self.graph)
-    }
-}
-
 /// A breadth first search (BFS) of a graph.
 ///
 /// Using a **Bfs** you can run a traversal over a graph while still retaining
@@ -373,32 +345,3 @@ pub fn visitor<G>(graph: &G, start: <G as Graphlike>::NodeId) -> Visitor<G> wher
 }
 */
 
-/// An iterator for a breadth first traversal of a graph.
-pub struct BfsIter<'a, G: 'a + Visitable>
-{
-    graph: &'a G,
-    bfs: Bfs<G::NodeId, G::Map>,
-}
-
-impl<'a, G: Visitable> BfsIter<'a, G> where
-    G::NodeId: Clone,
-{
-    pub fn new(graph: &'a G, start: G::NodeId) -> Self
-    {
-        BfsIter {
-            graph: graph,
-            bfs: Bfs::new(graph, start)
-        }
-    }
-}
-
-impl<'a, G: 'a + Visitable> Iterator for BfsIter<'a, G> where
-    G::NodeId: Clone,
-    G: for<'b> NeighborIter<'b>,
-{
-    type Item = G::NodeId;
-    fn next(&mut self) -> Option<G::NodeId>
-    {
-        self.bfs.next(self.graph)
-    }
-}

tests/graphmap.rs

@@ -3,9 +3,6 @@ extern crate petgraph;
 use petgraph::{
     GraphMap,
 };
-use petgraph::visit::{
-    DfsIter,
-};
 
 use petgraph::algo::{
     dijkstra,
@@ -87,8 +84,10 @@ fn dfs() {
     gr.add_edge(i, j, 1.);
     gr.add_edge(i, k, 2.);
 
+    /*
     assert_eq!(DfsIter::new(&gr, h).count(), 4);
     assert_eq!(DfsIter::new(&gr, i).count(), 4);
     assert_eq!(DfsIter::new(&gr, z).count(), 1);
+    */
 }
 

tests/ograph.rs

@@ -6,9 +6,7 @@ use std::iter::AdditiveIterator;
 use petgraph::{
     Graph,
     Bfs,
-    BfsIter,
     Dfs,
-    DfsIter,
     Incoming,
     Outgoing,
     Directed,
@@ -84,6 +82,7 @@ fn dfs() {
     gr.add_edge(i, j, 1.);
     gr.add_edge(i, k, 2.);
 
+    /*
     assert_eq!(DfsIter::new(&gr, h).count(), 4);
 
     assert_eq!(DfsIter::new(&Reversed(&gr), h).count(), 1);
@@ -93,6 +92,7 @@ fn dfs() {
     assert_eq!(DfsIter::new(&gr, i).count(), 3);
 
     assert_eq!(DfsIter::new(&AsUndirected(&gr), i).count(), 4);
+    */
 
 }
 
@@ -111,6 +111,7 @@ fn bfs() {
     gr.add_edge(i, j, 1.);
     gr.add_edge(i, k, 2.);
 
+    /*
     assert_eq!(BfsIter::new(&gr, h).count(), 4);
 
     assert_eq!(BfsIter::new(&Reversed(&gr), h).count(), 1);
@@ -120,6 +121,7 @@ fn bfs() {
     assert_eq!(BfsIter::new(&gr, i).count(), 3);
 
     assert_eq!(BfsIter::new(&AsUndirected(&gr), i).count(), 4);
+    */
 
     let mut bfs = Bfs::new(&gr, h);
     let nx = bfs.next(&gr);
@@ -302,9 +304,11 @@ fn dijk() {
     g.add_edge(c, f, 11);
     g.add_edge(e, f, 6);
     println!("{:?}", g);
+    /*
     for no in BfsIter::new(&g, a) {
         println!("Visit {:?} = {:?}", no, g.node_weight(no));
     }
+    */
 
     let scores = dijkstra(&g, a, None, |gr, n| gr.edges(n).map(|(n, &e)| (n, e)));
     let mut scores: Vec<_> = scores.into_iter().map(|(n, s)| (g[n], s)).collect();