Update to portgraph v0.7 (#219)

Cargo.toml

@@ -24,7 +24,7 @@ path = "src/lib.rs"
 
 [dependencies]
 thiserror = "1.0.28"
-portgraph = { version = "0.6.0", features = ["serde", "petgraph"] }
+portgraph = { version = "0.7.0", features = ["serde", "petgraph"] }
 pyo3 = { version = "0.19.0", optional = true, features = [
     "multiple-pymethods",
 ] }

src/hugr.rs

@@ -13,7 +13,7 @@ pub(crate) use self::hugrmut::HugrMut;
 pub use self::validate::ValidationError;
 
 use derive_more::From;
-pub use rewrite::{Replace, ReplaceError, Rewrite, SimpleReplacement, SimpleReplacementError};
+pub use rewrite::{Rewrite, SimpleReplacement, SimpleReplacementError};
 
 use portgraph::dot::{DotFormat, EdgeStyle, NodeStyle, PortStyle};
 use portgraph::multiportgraph::MultiPortGraph;

src/hugr/region.rs

@@ -133,14 +133,10 @@ impl<'g> HugrView for FlatRegionView<'g> {
     }
 
     fn children(&self, node: Node) -> Self::Children<'_> {
-        let mut iter = self.hierarchy.children(node.index).map_into();
-        if node != self.root {
-            // Eagerly empty the iterator.
-            // Ideally we would construct an empty iterator directly, but
-            // `Children` is not `Default`.
-            while iter.next().is_some() {}
+        match node == self.root {
+            true => self.hierarchy.children(node.index).map_into(),
+            false => portgraph::hierarchy::Children::default().map_into(),
         }
-        iter
     }
 
     fn neighbours(&self, node: Node, dir: Direction) -> Self::Neighbours<'_> {
@@ -271,14 +267,10 @@ impl<'g> HugrView for RegionView<'g> {
     }
 
     fn children(&self, node: Node) -> Self::Children<'_> {
-        let mut iter = self.hierarchy.children(node.index).map_into();
-        if !self.graph.contains_node(node.index) {
-            // Eagerly empty the iterator.
-            // Ideally we would construct an empty iterator directly, but
-            // `Children` is not `Default`.
-            while iter.next().is_some() {}
+        match self.graph.contains_node(node.index) {
+            true => self.hierarchy.children(node.index).map_into(),
+            false => portgraph::hierarchy::Children::default().map_into(),
         }
-        iter
     }
 
     fn neighbours(&self, node: Node, dir: Direction) -> Self::Neighbours<'_> {

src/hugr/rewrite.rs

@@ -1,11 +1,9 @@
 //! Rewrite operations on the HUGR - replacement, outlining, etc.
 
-pub mod replace;
 pub mod simple_replace;
 use std::mem;
 
 use crate::Hugr;
-pub use replace::{OpenHugr, Replace, ReplaceError};
 pub use simple_replace::{SimpleReplacement, SimpleReplacementError};
 
 /// An operation that can be applied to mutate a Hugr

src/lib.rs

@@ -19,7 +19,5 @@ pub mod resource;
 pub mod types;
 mod utils;
 
-pub use crate::hugr::{
-    Direction, Hugr, HugrView, Node, Port, Replace, ReplaceError, SimpleReplacement, Wire,
-};
+pub use crate::hugr::{Direction, Hugr, HugrView, Node, Port, SimpleReplacement, Wire};
 pub use crate::resource::Resource;