flatten leaf module and simplify some ops in to tuple structs

hugr-core/src/builder/build_traits.rs

@@ -1,4 +1,4 @@
-use crate::extension::prelude::leaf::MakeTuple;
+use crate::extension::prelude::MakeTuple;
 use crate::hugr::hugrmut::InsertionResult;
 use crate::hugr::views::HugrView;
 use crate::hugr::{NodeMetadata, ValidationError};
@@ -580,7 +580,7 @@ pub trait Dataflow: Container {
             .map(|&wire| self.get_wire_type(wire))
             .collect();
         let types = types?.into();
-        let make_op = self.add_dataflow_op(MakeTuple { tys: types }, values)?;
+        let make_op = self.add_dataflow_op(MakeTuple(types), values)?;
         Ok(make_op.out_wire(0))
     }
 

hugr-core/src/builder/dataflow.rs

@@ -206,7 +206,7 @@ pub(crate) mod test {
     use crate::builder::{
         endo_sig, inout_sig, BuilderWiringError, DataflowSubContainer, ModuleBuilder,
     };
-    use crate::extension::prelude::leaf::{Lift, Noop};
+    use crate::extension::prelude::{Lift, Noop};
     use crate::extension::prelude::{BOOL_T, USIZE_T};
     use crate::extension::{ExtensionId, SignatureError, EMPTY_REG, PRELUDE_REGISTRY};
     use crate::hugr::validate::InterGraphEdgeError;
@@ -326,15 +326,15 @@ pub(crate) mod test {
             )?;
 
             let [i1] = f_build.input_wires_arr();
-            let noop = f_build.add_dataflow_op(Noop { ty: BIT }, [i1])?;
+            let noop = f_build.add_dataflow_op(Noop(BIT), [i1])?;
             let i1 = noop.out_wire(0);
 
             let mut nested = f_build.dfg_builder(
                 Signature::new(type_row![], type_row![BIT]).with_prelude(),
                 [],
             )?;
 
-            let id = nested.add_dataflow_op(Noop { ty: BIT }, [i1])?;
+            let id = nested.add_dataflow_op(Noop(BIT), [i1])?;
 
             let nested = nested.finish_with_outputs([id.out_wire(0)])?;
 
@@ -350,12 +350,12 @@ pub(crate) mod test {
             FunctionBuilder::new("main", Signature::new(type_row![QB], type_row![QB]))?;
 
         let [i1] = f_build.input_wires_arr();
-        let noop = f_build.add_dataflow_op(Noop { ty: QB }, [i1])?;
+        let noop = f_build.add_dataflow_op(Noop(QB), [i1])?;
         let i1 = noop.out_wire(0);
 
         let mut nested = f_build.dfg_builder(Signature::new(type_row![], type_row![QB]), [])?;
 
-        let id_res = nested.add_dataflow_op(Noop { ty: QB }, [i1]);
+        let id_res = nested.add_dataflow_op(Noop(QB), [i1]);
 
         // The error would anyway be caught in validation when we finish the Hugr,
         // but the builder catches it earlier

hugr-core/src/builder/tail_loop.rs

@@ -111,7 +111,7 @@ mod test {
             test::{BIT, NAT},
             DataflowSubContainer, HugrBuilder, ModuleBuilder, SubContainer,
         },
-        extension::prelude::{leaf::Lift, ConstUsize, PRELUDE_ID, USIZE_T},
+        extension::prelude::{ConstUsize, Lift, PRELUDE_ID, USIZE_T},
         hugr::ValidationError,
         ops::Value,
         type_row,