rename finish() to finish_container()

Author: ss2165

src/algorithm/nest_cfgs.rs

@@ -449,10 +449,10 @@ pub(crate) mod test {
         cfg_builder.branch(&merge, 0, &head)?;
         let exit = cfg_builder.exit_block();
         cfg_builder.branch(&tail, 0, &exit)?;
-        let cfg_id = cfg_builder.finish()?;
+        let cfg_id = cfg_builder.finish_container()?;
 
         func_builder.finish_with_outputs(cfg_id.outputs())?;
-        module_builder.finish()?;
+        module_builder.finish_container()?;
         let h = builder.finish()?;
 
         let (entry, exit) = (entry.node(), exit.node());
@@ -501,10 +501,10 @@ pub(crate) mod test {
         cfg_builder.branch(&merge, 0, &tail)?; // trivial "loop body"
         let exit = cfg_builder.exit_block();
         cfg_builder.branch(&tail, 0, &exit)?;
-        let cfg_id = cfg_builder.finish()?;
+        let cfg_id = cfg_builder.finish_container()?;
 
         func_builder.finish_with_outputs(cfg_id.outputs())?;
-        module_builder.finish()?;
+        module_builder.finish_container()?;
 
         let h = builder.finish()?;
 
@@ -717,10 +717,10 @@ pub(crate) mod test {
         cfg_builder.branch(&entry, 0, &head)?;
         cfg_builder.branch(&tail, 0, &exit)?;
 
-        let cfg_id = cfg_builder.finish()?;
+        let cfg_id = cfg_builder.finish_container()?;
 
         func_builder.finish_with_outputs(cfg_id.outputs())?;
-        module_builder.finish()?;
+        module_builder.finish_container()?;
 
         let h = builder.finish()?;
 

src/builder.rs

@@ -165,7 +165,7 @@ mod test {
         let f_builder = module_builder.declare_and_def("main", signature)?;
 
         f(f_builder)?;
-        module_builder.finish()?;
+        module_builder.finish_container()?;
         builder.finish()
     }
 }

src/builder/build_traits.rs

@@ -60,7 +60,7 @@ pub trait Container {
 
     /// Consume the container builder and return the handle, may perform some
     /// checks before finishing.
-    fn finish(self) -> Result<Self::ContainerHandle, BuildError>;
+    fn finish_container(self) -> Result<Self::ContainerHandle, BuildError>;
 }
 
 /// Trait for building dataflow regions of a HUGR.
@@ -124,7 +124,7 @@ pub trait Dataflow: Container {
         Self: Sized,
     {
         self.set_outputs(outputs)?;
-        self.finish()
+        self.finish_container()
     }
 
     /// Return an array of the input wires.

src/builder/cfg.rs

@@ -41,7 +41,7 @@ impl<B: HugrMutRef> Container for CFGBuilder<B> {
     }
 
     #[inline]
-    fn finish(self) -> Result<Self::ContainerHandle, BuildError> {
+    fn finish_container(self) -> Result<Self::ContainerHandle, BuildError> {
         Ok((self.cfg_node, self.n_out_wires).into())
     }
 }
@@ -178,7 +178,7 @@ impl<B: HugrMutRef> BlockBuilder<B> {
         Self: Sized,
     {
         self.set_outputs(branch_wire, outputs)?;
-        self.finish()
+        self.finish_container()
     }
 }
 
@@ -229,12 +229,12 @@ mod test {
                     cfg_builder.branch(&middle, 0, &exit)?;
                     cfg_builder.branch(&entry, 1, &exit)?;
 
-                    cfg_builder.finish()?
+                    cfg_builder.finish_container()?
                 };
 
                 func_builder.finish_with_outputs(cfg_id.outputs())?
             };
-            module_builder.finish()?;
+            module_builder.finish_container()?;
             builder.finish()
         };
 

src/builder/conditional.rs

@@ -64,7 +64,7 @@ impl<T: HugrMutRef> Container for ConditionalBuilder<T> {
         self.base.as_ref().hugr()
     }
 
-    fn finish(self) -> Result<Self::ContainerHandle, BuildError> {
+    fn finish_container(self) -> Result<Self::ContainerHandle, BuildError> {
         let cases: HashSet<usize> = self
             .case_nodes
             .iter()
@@ -175,12 +175,12 @@ mod test {
                     n_identity(conditional_b.case_builder(0)?)?;
                     n_identity(conditional_b.case_builder(1)?)?;
 
-                    conditional_b.finish()?
+                    conditional_b.finish_container()?
                 };
                 let [int] = conditional_id.outputs_arr();
                 fbuild.finish_with_outputs([int])?
             };
-            module_builder.finish()?;
+            module_builder.finish_container()?;
             builder.finish()
         };
 

src/builder/dataflow.rs

@@ -78,7 +78,7 @@ impl<T: HugrMutRef> Container for DFGBuilder<T> {
         self.base.as_mut()
     }
     #[inline]
-    fn finish(self) -> Result<Self::ContainerHandle, BuildError> {
+    fn finish_container(self) -> Result<Self::ContainerHandle, BuildError> {
         Ok((self.dfg_node, self.num_out_wires).into())
     }
 
@@ -134,9 +134,9 @@ impl<B: HugrMutRef, T: From<BuildHandle<DfgID>>> Container for DFGWrapper<B, T>
         self.0.as_ref().unwrap().hugr()
     }
     #[inline]
-    fn finish(mut self) -> Result<Self::ContainerHandle, BuildError> {
+    fn finish_container(mut self) -> Result<Self::ContainerHandle, BuildError> {
         let dfg = self.0.take().expect("Already finished.");
-        dfg.finish().map(Into::into)
+        dfg.finish_container().map(Into::into)
     }
 }
 
@@ -193,7 +193,7 @@ mod test {
 
                 func_builder.finish_with_outputs(inner_id.outputs().chain(q_out.outputs()))?
             };
-            module_builder.finish()?;
+            module_builder.finish_container()?;
             builder.finish()
         };
 
@@ -220,7 +220,7 @@ mod test {
 
             f(f_build)?;
 
-            module_builder.finish()?;
+            module_builder.finish_container()?;
             builder.finish()
         };
         assert_matches!(build_result, Ok(_), "Failed on example: {}", msg);
@@ -271,7 +271,7 @@ mod test {
             let [q1] = f_build.input_wires_arr();
             f_build.finish_with_outputs([q1, q1])?;
 
-            module_builder.finish()?;
+            module_builder.finish_container()?;
             builder.finish()
         };
 
@@ -299,7 +299,7 @@ mod test {
 
             f_build.finish_with_outputs([nested.out_wire(0)])?;
 
-            module_builder.finish()?;
+            module_builder.finish_container()?;
             builder.finish()
         };
 

src/builder/module_builder.rs

@@ -36,7 +36,7 @@ impl<T: HugrMutRef> Container for ModuleBuilder<T> {
     }
 
     #[inline]
-    fn finish(self) -> Result<Self::ContainerHandle, BuildError> {
+    fn finish_container(self) -> Result<Self::ContainerHandle, BuildError> {
         Ok(())
     }
 

src/builder/tail_loop.rs

@@ -50,7 +50,7 @@ impl<B: HugrMutRef> TailLoopBuilder<B> {
         Self: Sized,
     {
         self.set_outputs(out_variant, rest)?;
-        self.finish()
+        self.finish_container()
     }
 
     /// Get a reference to the [`crate::ops::controlflow::TailLoopSignature`]
@@ -117,7 +117,7 @@ mod test {
 
                 fbuild.finish_with_outputs(loop_id.outputs())?
             };
-            module_builder.finish()?;
+            module_builder.finish_container()?;
             builder.finish()
         };
 
@@ -169,15 +169,15 @@ mod test {
                         let break_wire = branch_1.make_break(signature, [wire])?;
                         branch_1.finish_with_outputs([break_wire])?;
 
-                        conditional_b.finish()?
+                        conditional_b.finish_container()?
                     };
 
                     loop_b.finish_with_outputs(conditional_id.out_wire(0), [])?
                 };
 
                 fbuild.finish_with_outputs(loop_id.outputs())?
             };
-            module_builder.finish()?;
+            module_builder.finish_container()?;
             builder.finish()
         };