Smoke-test boots with full ford-turbo merge.

lib/collections.hoon

@@ -6,8 +6,9 @@
 ::
 ::
 |%
-+=  collection  [meta=config data=(map nom=knot =item)]
++=  collection  [meta=config data=(map nom=knot =item)]  
 +=  item
+  $~  [%raw %umd ~ %$]
   $%  [%collection col=collection]
       [%raw raw=raw-item]
       [%both col=collection raw=raw-item]

lib/cram.hoon

@@ -16,7 +16,7 @@
   ~|(%many-elems !!)
 ::
 ++  shut-mart                                           :: xml attrs
-  |=({n/mane v/(list beer:hoon)} [n (turn v |=(a/beer:hoon ?^(a !! a)))])
+  |=({n/mane v/(list beer:hoot)} [n (turn v |=(a/beer:hoot ?^(a !! a)))])
 ::
 ++  shut                                                :: as xml constant
   |=  gen/hoon  ^-  marl

lib/hood/kiln.hoon

@@ -276,15 +276,11 @@
   ?>  (gte start now)
   abet:(emit %wait /kiln/overload/(scot %dr recur) start)
 ::
-<<<<<<< HEAD
-++  poke-wipe-ford  |=(~ abet:(emit %wipe /kiln our ~))
-=======
 ++  poke-wipe-ford
-  |=($~ abet:(emit %wipe /kiln our ~))
+  |=(~ abet:(emit %wipe /kiln our ~))
 ::
 ++  poke-keep-ford
   |=(max-cache-size=@ud abet:(emit %keep /kiln max-cache-size))
->>>>>>> origin/ford-turbo
 ::
 ++  mack
   |=  {way/wire saw/(unit tang)}

lib/new-hoon.hoon

@@ -853,7 +853,7 @@
   |*  [a=mold b=mold]
   %+  cork  (tree (pair a b))
   |=  c/(tree (pair a b))  ^+  c
-  ?.((valid:dct c) ~ c)
+  ?~(c ~ ?.((valid:dct c) ~ c))
 ::
 ++  dct
   |%

lib/tester.hoon

@@ -12,6 +12,7 @@
   (list instance)
 ::
 +$  instance
+  $~  [%$ [%| ~]]
   ::  a mapping between a term and part of a test tree.
   (pair term (each $-(@uvJ (list tank)) tests))
 ::

sys/vane/ford.hoon

@@ -2520,6 +2520,7 @@
         (return-blocks [hood-build]~)
       ::
       ?:  ?=(%error -.u.hood-result)
+        ~&  [%make-core-error source-path]
         (wrap-error hood-result)
       ::  build the +scaffold into a program
       ::

sys/zuse.hoon

@@ -122,9 +122,9 @@
           {$nuke p/@p}                                  ::  toggle auto-block
           {$make p/(unit @t) q/@ud r/@ s/?}             ::  wild license
           {$sith p/@p q/@uw r/?}                        ::  imperial generator
-          {$tend ~}                                    ::  watch lane changes
-          {$wake ~}                                    ::  timer activate
-          {$wegh ~}                                    ::  report memory
+          {$tend ~}                                     ::  watch lane changes
+          {$wake ~}                                     ::  timer activate
+          {$wegh ~}                                     ::  report memory
           {$west p/sack q/path r/*}                     ::  network request
           {$want p/sock q/path r/*}                     ::  forward message
       ==                                                ::