more minor changes

Author: lmondada

hugr-persistent/src/commit.rs

@@ -294,8 +294,9 @@ impl<'a> Commit<'a> {
     /// Change the lifetime of the commit.
     ///
     /// This is unsafe because it cannot be guaranteed that the commit will
-    /// live as long as the lifetime 'b.
-    pub(crate) unsafe fn upgrade_lifetime<'b>(self) -> Commit<'b> {
+    /// live as long as the lifetime 'b. The user must guuarantee that the
+    /// rewrite space of `self` is valid as long as the lifetime 'b.
+    pub unsafe fn upgrade_lifetime<'b>(self) -> Commit<'b> {
         Commit(self.0, PhantomData)
     }
 }

hugr-persistent/src/persistent_hugr.rs

@@ -355,7 +355,6 @@ impl PersistentHugr {
     pub fn apply_all(&self) -> (Hugr, HashMap<PatchNode, Node>) {
         let mut hugr = self.base_hugr().clone();
         let mut node_map = HashMap::from_iter(hugr.nodes().map(|n| (PatchNode(self.base(), n), n)));
-        println!("\n\nstart apply_all");
         for commit_id in self.toposort_commits() {
             let Some(repl) = self.get_commit(commit_id).replacement() else {
                 continue;

hugr-persistent/src/state_space.rs

@@ -210,7 +210,7 @@ impl CommitStateSpace {
     /// Get the (unique) base commit of the state space.
     ///
     /// Return `None` if `self` is empty.
-    pub(crate) fn base_commit<'a>(&'a self) -> Option<Commit<'a>> {
+    pub fn base_commit<'a>(&'a self) -> Option<Commit<'a>> {
         // get any commit
         let (_, relrc) = self.borrow().iter().next()?;
         // SAFETY: commit will be alive as long as the state space

hugr-persistent/src/trait_impls.rs

@@ -16,17 +16,19 @@ use hugr_core::{
     ops::OpType,
 };
 
+use crate::CommitId;
+
 use super::{
     InvalidCommit, PatchNode, PersistentHugr, PersistentReplacement, state_space::CommitData,
 };
 
 impl Patch<PersistentHugr> for PersistentReplacement {
-    type Outcome = ();
+    type Outcome = CommitId;
     const UNCHANGED_ON_FAILURE: bool = true;
 
     fn apply(self, h: &mut PersistentHugr) -> Result<Self::Outcome, Self::Error> {
         match h.try_add_replacement(self) {
-            Ok(_) => Ok(()),
+            Ok(commit) => Ok(commit),
             Err(
                 InvalidCommit::UnknownParent(_)
                 | InvalidCommit::IncompatibleHistory(_, _)

hugr-persistent/src/walker.rs

@@ -496,6 +496,14 @@ impl From<InvalidCommit> for PinNodeError {
     }
 }
 
+impl<'w> hugr_core::hugr::views::NodesIter for Walker<'w> {
+    type Node = PatchNode;
+
+    fn nodes(&self) -> impl Iterator<Item = Self::Node> + '_ {
+        <PersistentHugr as HugrView>::nodes(self.as_hugr_view())
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use std::collections::BTreeSet;