chore: cleanup

Author: indietyp

libs/@local/hashql/mir/src/builder/mod.rs

@@ -115,33 +115,6 @@ macro_rules! op {
     [neg] => { hashql_hir::node::operation::UnOp::Neg };
 }
 
-/// Scaffold macro for setting up MIR builder infrastructure.
-///
-/// Creates the heap, interner, and body builder needed for constructing MIR.
-/// This is the recommended way to initialize the builder for tests and benchmarks.
-///
-/// # Example
-///
-/// ```
-/// use hashql_core::{id::Id, r#type::TypeId};
-/// use hashql_mir::{builder::BodyBuilder, scaffold};
-///
-/// scaffold!(heap, interner, builder);
-///
-/// let x = builder.local("x", TypeId::MAX);
-/// let entry = builder.reserve_block([]);
-/// builder.build_block(entry).ret(x);
-/// let body = builder.finish(0, TypeId::MAX);
-/// ```
-#[macro_export]
-macro_rules! scaffold {
-    ($heap:ident, $interner:ident, $builder:ident) => {
-        let $heap = hashql_core::heap::Heap::new();
-        let $interner = $crate::intern::Interner::new(&$heap);
-        let mut $builder = $crate::builder::BodyBuilder::new(&$interner);
-    };
-}
-
 #[doc(hidden)]
 pub mod _private {
     pub use super::{
@@ -153,4 +126,3 @@ pub mod _private {
 }
 
 pub use op;
-pub use scaffold;

libs/@local/hashql/mir/src/builder/operand.rs

@@ -75,9 +75,6 @@ macro_rules! operand {
     (@impl $o:expr; null) => {
         $o.const_null()
     };
-    (@impl $o:expr; fn() @ $def:ident) => {
-        $o.const_fn($def)
-    };
     (@impl $o:expr; $value:expr) => {
         $crate::builder::_private::BuildOperand::build_operand(&$o, $value)
     };

libs/@local/hashql/mir/src/pass/transform/cp/tests.rs

@@ -18,7 +18,7 @@ use crate::{
         operand::Operand,
         terminator::{GraphRead, GraphReadHead, GraphReadTail, TerminatorKind},
     },
-    builder::{body, op, scaffold},
+    builder::{BodyBuilder, body, op},
     context::MirContext,
     def::DefIdSlice,
     intern::Interner,
@@ -261,12 +261,15 @@ fn block_param_via_local() {
 /// Uses the fluent API because of the custom terminator.
 #[test]
 fn block_param_effectful() {
-    scaffold!(heap, interner, builder);
+    let heap = hashql_core::heap::Heap::new();
+    let interner = Interner::new(&heap);
+
     let env = Environment::new(&heap);
 
     let int_ty = TypeBuilder::synthetic(&env).integer();
     let bool_ty = TypeBuilder::synthetic(&env).boolean();
 
+    let mut builder = BodyBuilder::new(&interner);
     let axis = builder.local("axis", TypeBuilder::synthetic(&env).unknown());
     let p = builder.local("p", int_ty);
     let r = builder.local("r", bool_ty);

libs/@local/hashql/mir/src/pass/transform/dle/tests.rs

@@ -14,7 +14,7 @@ use insta::{Settings, assert_snapshot};
 use super::DeadLocalElimination;
 use crate::{
     body::Body,
-    builder::{body, scaffold},
+    builder::{BodyBuilder, body},
     context::MirContext,
     def::DefIdSlice,
     intern::Interner,
@@ -222,12 +222,14 @@ fn unused_args_preserved() {
 /// Uses fluent builder API because index projections are not supported by the `body!` macro.
 #[test]
 fn projection_locals_preserved() {
-    scaffold!(heap, interner, builder);
+    let heap = Heap::new();
+    let interner = Interner::new(&heap);
     let env = Environment::new(&heap);
 
     let int_ty = TypeBuilder::synthetic(&env).integer();
     let list_ty = TypeBuilder::synthetic(&env).list(int_ty);
 
+    let mut builder = BodyBuilder::new(&interner);
     let list = builder.local("list", list_ty);
     let index = builder.local("index", int_ty);
     let element = builder.local("element", int_ty);

libs/@local/hashql/mir/src/pass/transform/dse/tests.rs

@@ -18,7 +18,7 @@ use crate::{
         operand::Operand,
         terminator::{GraphRead, GraphReadHead, GraphReadTail, TerminatorKind},
     },
-    builder::{body, scaffold},
+    builder::{BodyBuilder, body},
     context::MirContext,
     def::DefIdSlice,
     intern::Interner,
@@ -332,13 +332,16 @@ fn dead_param_multiple_predecessors() {
 /// Uses fluent builder API because `GraphRead` terminator is not supported by the `body!` macro.
 #[test]
 fn graph_read_token_preserved() {
-    scaffold!(heap, interner, builder);
+    let heap = Heap::new();
+    let interner = Interner::new(&heap);
+
     let env = Environment::new(&heap);
 
     let int_ty = TypeBuilder::synthetic(&env).integer();
     let token_ty =
         TypeBuilder::synthetic(&env).opaque("GraphToken", TypeBuilder::synthetic(&env).unknown());
 
+    let mut builder = BodyBuilder::new(&interner);
     let axis = builder.local("axis", TypeBuilder::synthetic(&env).unknown());
     let token = builder.local("token", token_ty);
     let dead = builder.local("dead", int_ty);