And update snapshots

Author: acl-cqc

hugr-core/tests/snapshots/model__roundtrip_add.snap

@@ -12,6 +12,8 @@ expression: ast
 
 (import core.fn)
 
+(import core.meta.func_name)
+
 (import arithmetic.int.types.int)
 
 (declare-operation
@@ -29,6 +31,7 @@ expression: ast
   (core.fn
     [(arithmetic.int.types.int 6) (arithmetic.int.types.int 6)]
     [(arithmetic.int.types.int 6)])
+  (meta (core.meta.func_name ""))
   (dfg [%0 %1] [%2]
     (signature
       (core.fn

hugr-core/tests/snapshots/model__roundtrip_call.snap

@@ -1,6 +1,6 @@
 ---
 source: hugr-core/tests/model.rs
-expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-call.edn\"))"
+expression: ast
 ---
 (hugr 0)
 
@@ -16,6 +16,8 @@ expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-call
 
 (import arithmetic.int.types.int)
 
+(import core.meta.func_name)
+
 (declare-func
   example.callee
   (core.fn [arithmetic.int.types.int] [arithmetic.int.types.int])
@@ -25,6 +27,7 @@ expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-call
 (define-func
   example.caller
   (core.fn [arithmetic.int.types.int] [arithmetic.int.types.int])
+  (meta (core.meta.func_name ""))
   (meta
     (compat.meta_json
       "description"
@@ -43,6 +46,7 @@ expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-call
 (define-func
   example.load
   (core.fn [] [(core.fn [arithmetic.int.types.int] [arithmetic.int.types.int])])
+  (meta (core.meta.func_name ""))
   (dfg [] [%0]
     (signature
       (core.fn

hugr-core/tests/snapshots/model__roundtrip_cfg.snap

@@ -1,6 +1,6 @@
 ---
 source: hugr-core/tests/model.rs
-expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-cfg.edn\"))"
+expression: ast
 ---
 (hugr 0)
 
@@ -14,9 +14,12 @@ expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-cfg.
 
 (import core.fn)
 
+(import core.meta.func_name)
+
 (import core.adt)
 
 (define-func example.cfg_loop (param ?0 core.type) (core.fn [?0] [?0])
+  (meta (core.meta.func_name ""))
   (dfg [%0] [%1]
     (signature (core.fn [?0] [?0]))
     (cfg [%0] [%1]
@@ -32,6 +35,7 @@ expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-cfg.
               (signature (core.fn [?0] [(core.adt [[?0] [?0]])])))))))))
 
 (define-func example.cfg_order (param ?0 core.type) (core.fn [?0] [?0])
+  (meta (core.meta.func_name ""))
   (dfg [%0] [%1]
     (signature (core.fn [?0] [?0]))
     (cfg [%0] [%1]

hugr-core/tests/snapshots/model__roundtrip_cond.snap

@@ -12,6 +12,8 @@ expression: ast
 
 (import core.fn)
 
+(import core.meta.func_name)
+
 (import core.adt)
 
 (import arithmetic.int.types.int)
@@ -29,6 +31,7 @@ expression: ast
   (core.fn
     [(core.adt [[] []]) (arithmetic.int.types.int 6)]
     [(arithmetic.int.types.int 6)])
+  (meta (core.meta.func_name ""))
   (dfg [%0 %1] [%2]
     (signature
       (core.fn

hugr-core/tests/snapshots/model__roundtrip_const.snap

@@ -1,6 +1,6 @@
 ---
 source: hugr-core/tests/model.rs
-expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-const.edn\"))"
+expression: ast
 ---
 (hugr 0)
 
@@ -14,11 +14,13 @@ expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-cons
 
 (import arithmetic.int.const)
 
-(import arithmetic.float.const_f64)
+(import core.meta.func_name)
+
+(import arithmetic.int.types.int)
 
 (import core.const.adt)
 
-(import arithmetic.int.types.int)
+(import arithmetic.float.const_f64)
 
 (import collections.array.const)
 
@@ -29,6 +31,7 @@ expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-cons
 (import core.adt)
 
 (define-func example.bools (core.fn [] [(core.adt [[] []]) (core.adt [[] []])])
+  (meta (core.meta.func_name ""))
   (dfg [] [%0 %1]
     (signature (core.fn [] [(core.adt [[] []]) (core.adt [[] []])]))
     ((core.load_const (core.const.adt [[] []] _ 0 [])) [] [%0]
@@ -43,6 +46,7 @@ expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-cons
     [(core.adt
        [[(collections.array.array 5 (arithmetic.int.types.int 6))
          arithmetic.float.types.float64]])])
+  (meta (core.meta.func_name ""))
   (dfg [] [%0]
     (signature
       (core.fn
@@ -74,6 +78,7 @@ expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-cons
                arithmetic.float.types.float64]])])))))
 
 (define-func example.f64-json (core.fn [] [arithmetic.float.types.float64])
+  (meta (core.meta.func_name ""))
   (dfg [] [%0 %1]
     (signature
       (core.fn

hugr-core/tests/snapshots/model__roundtrip_constraints.snap

@@ -1,6 +1,6 @@
 ---
 source: hugr-core/tests/model.rs
-expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-constraints.edn\"))"
+expression: ast
 ---
 (hugr 0)
 
@@ -16,6 +16,8 @@ expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-cons
 
 (import core.fn)
 
+(import core.meta.func_name)
+
 (declare-func
   array.replicate
   (param ?0 core.nat)
@@ -37,4 +39,5 @@ expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-cons
   (param ?0 core.type)
   (where (core.nonlinear ?0))
   (core.fn [?0] [?0 ?0])
+  (meta (core.meta.func_name ""))
   (dfg [%0] [%0 %0] (signature (core.fn [?0] [?0 ?0]))))

hugr-core/tests/snapshots/model__roundtrip_entrypoint.snap

@@ -1,25 +1,31 @@
 ---
 source: hugr-core/tests/model.rs
-expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-entrypoint.edn\"))"
+expression: ast
 ---
 (hugr 0)
 
 (mod)
 
 (import core.fn)
 
+(import core.meta.func_name)
+
 (import core.entrypoint)
 
 (define-func main (core.fn [] [])
+  (meta (core.meta.func_name ""))
   (dfg (signature (core.fn [] [])) (meta core.entrypoint)))
 
 (mod)
 
 (import core.fn)
 
+(import core.meta.func_name)
+
 (import core.entrypoint)
 
 (define-func wrapper_dfg (core.fn [] [])
+  (meta (core.meta.func_name ""))
   (dfg (signature (core.fn [] [])) (meta core.entrypoint)))
 
 (mod)
@@ -30,11 +36,14 @@ expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-entr
 
 (import core.fn)
 
+(import core.meta.func_name)
+
 (import core.entrypoint)
 
 (import core.adt)
 
 (define-func wrapper_cfg (core.fn [] [])
+  (meta (core.meta.func_name ""))
   (dfg
     (signature (core.fn [] []))
     (cfg

hugr-core/tests/snapshots/model__roundtrip_loop.snap

@@ -1,6 +1,6 @@
 ---
 source: hugr-core/tests/model.rs
-expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-loop.edn\"))"
+expression: ast
 ---
 (hugr 0)
 
@@ -12,9 +12,12 @@ expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-loop
 
 (import core.fn)
 
+(import core.meta.func_name)
+
 (import core.adt)
 
 (define-func example.loop (param ?0 core.type) (core.fn [?0] [?0])
+  (meta (core.meta.func_name ""))
   (dfg [%0] [%1]
     (signature (core.fn [?0] [?0]))
     (tail-loop [%0] [%1]

hugr-core/tests/snapshots/model__roundtrip_order.snap

@@ -14,10 +14,12 @@ expression: ast
 
 (import core.fn)
 
-(import core.order_hint.order)
+(import core.meta.func_name)
 
 (import arithmetic.int.types.int)
 
+(import core.order_hint.order)
+
 (declare-operation
   arithmetic.int.ineg
   (param ?0 core.nat)
@@ -37,6 +39,7 @@ expression: ast
      (arithmetic.int.types.int 6)
      (arithmetic.int.types.int 6)
      (arithmetic.int.types.int 6)])
+  (meta (core.meta.func_name ""))
   (dfg [%0 %1 %2 %3] [%4 %5 %6 %7]
     (signature
       (core.fn

hugr-core/tests/snapshots/model__roundtrip_params.snap

@@ -1,19 +1,21 @@
 ---
 source: hugr-core/tests/model.rs
-expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-params.edn\"))"
+expression: ast
 ---
 (hugr 0)
 
 (mod)
 
-(import core.bytes)
-
-(import core.nat)
-
 (import core.call)
 
 (import core.type)
 
+(import core.meta.func_name)
+
+(import core.bytes)
+
+(import core.nat)
+
 (import core.fn)
 
 (import core.str)
@@ -25,6 +27,7 @@ expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-para
   (param ?0 core.type)
   (param ?1 core.type)
   (core.fn [?0 ?1] [?1 ?0])
+  (meta (core.meta.func_name ""))
   (dfg [%0 %1] [%1 %0] (signature (core.fn [?0 ?1] [?1 ?0]))))
 
 (declare-func
@@ -36,6 +39,7 @@ expression: "roundtrip(include_str!(\"../../hugr-model/tests/fixtures/model-para
   (core.fn [] []))
 
 (define-func example.call_literals (core.fn [] [])
+  (meta (core.meta.func_name ""))
   (dfg
     (signature (core.fn [] []))
     ((core.call