clay: remove +bunt from marks

pkg/arvo/app/dojo.hoon

@@ -875,7 +875,7 @@
           %ge  (dy-run-generator (dy-cage p.p.p.bil) q.p.bil)
           %sa
         =+  .^(=dais:clay cb+(en-beam he-beak /[p.bil]))
-        (dy-hand p.bil bunt:dais)
+        (dy-hand p.bil *vale:dais)
       ::
           %as
         =/  cag=cage  (dy-cage p.q.bil)

pkg/arvo/lib/strandio.hoon

@@ -490,7 +490,7 @@
   =/  m  (strand ,vase)
   ^-  form:m
   ;<  =riot:clay  bind:m
-    (warp ship desk ~ %sing %b case /[mak])
+    (warp ship desk ~ %sing %e case /[mak])
   ?~  riot
     (strand-fail %build-nave >arg< ~)
   ?>  =(%nave p.r.u.riot)

pkg/arvo/sys/lull.hoon

@@ -955,7 +955,6 @@
     $_
     ^?
     |%
-    ++  bunt  *typ
     ++  diff  |~([old=typ new=typ] *dif)
     ++  form  *mark
     ++  join  |~([a=dif b=dif] *(unit (unit dif)))
@@ -970,7 +969,6 @@
   +$  dais
     $_  ^|
     |_  sam=vase
-    ++  bunt  sam
     ++  diff  |~(new=_sam *vase)
     ++  form  *mark
     ++  join  |~([a=vase b=vase] *(unit (unit vase)))

pkg/arvo/sys/vane/clay.hoon

@@ -559,7 +559,6 @@
         =/  dif  diff:deg
         ^-  (nave typ dif)
         |%
-        ++  bunt  +<.cor
         ++  diff
           |=  [old=typ new=typ]
           ^-  dif
@@ -581,7 +580,6 @@
       =/  dif  _*diff:grad:cor
       ^-  (nave:clay typ dif)
       |%
-      ++  bunt  +<.cor
       ++  diff  |=([old=typ new=typ] (diff:~(grad cor old) new))
       ++  form  form:grad:cor
       ++  join
@@ -622,7 +620,6 @@
       :_  nub
       ^-  dais
       |_  sam=vase
-      ++  bunt  (slap nav limb/%bunt)
       ++  diff
         |=  new=vase
         (slam (slap nav limb/%diff) (slop sam new))
@@ -649,7 +646,7 @@
         |=  diff=vase
         (slam (slap nav limb/%pact) (slop sam diff))
       ++  vale
-        |=  =noun
+        |:  noun=q:(slap nav !,(*hoon *vale))
         (slam (slap nav limb/%vale) noun/noun)
       --
     ::  +build-cast: produce gate to convert mark .a to, statically typed
@@ -2313,7 +2310,7 @@
           =+  (slag (dec (lent path)) path)
           ?~(- %$ i.-)
         =/  =dais  (get-dais mark)
-        =/  res=(unit (unit vase))  (~(join dais bunt:dais) q.cal q.cob)
+        =/  res=(unit (unit vase))  (~(join dais *vale:dais) q.cal q.cob)
         ?~  res
           `[form:dais q.cob]
         ?~  u.res
@@ -3528,11 +3525,11 @@
         [[~ ~] fod.dom]
       =/  cached=(unit [=vase *])  (~(get by naves.fod.dom) i.path)
       ?^  cached
-        :_(fod.dom [~ ~ %& %nave !>(vase.u.cached)])
+        :_(fod.dom [~ ~ %& %nave vase.u.cached])
       =^  =vase  fod.dom
         %-  wrap:fusion
         (build-nave:(ford:fusion static-ford-args) i.path)
-      :_(fod.dom [~ ~ %& %nave !>(vase)])
+      :_(fod.dom [~ ~ %& %nave vase])
     ::
     ++  read-f
       !.

pkg/arvo/tests/sys/vane/clay.hoon

@@ -112,7 +112,7 @@
     ;:  weld
       %+  expect-eq
         !>(*mime)
-        (slap res limb/%bunt)
+        (slap res !,(*hoon *vale))
     ::
       %+  expect-eq
         !>  (~(gas in *(set path)) /mar/mime/hoon ~)
@@ -139,7 +139,7 @@
     ;:  weld
       %+  expect-eq
         !>(*@t)
-        (slap res limb/%bunt)
+        (slap res !,(*hoon *vale))
     ::
       %+  expect-eq
         !>  (~(gas in *(set path)) /mar/udon/hoon /lib/cram/hoon ~)
@@ -170,7 +170,7 @@
   =/  changes
     %-  my
     :~  [/mar/mime/hoon &+hoon+mar-mime]
-        [/lib/foo/hoon &+hoon+'/%  moo  %mime\0abunt:moo']
+        [/lib/foo/hoon &+hoon+'/%  moo  %mime\0a*vale:moo']
     ==
   =/  ford
     %:  ford:fusion

pkg/arvo/tests/sys/vane/eyre.hoon

@@ -2353,7 +2353,6 @@
     :^  ~  ~  %dais
     !>  ^-  dais:clay
     |_  sam=vase
-    ++  bunt  !!
     ++  diff  !!
     ++  form  !!
     ++  join  !!