Merge branch 'master' of https://github.com/urbit/arvo into remaint-merge-talk

app/ask.hoon

@@ -81,7 +81,7 @@
 ::
 ++  poke-sole-action
   |=  act/sole-action
-  ^-  (quip {bone card} +>)
+  ^-  (quip {bone card} _+>)
   =/  som  (~(got by sos) ost.bow)
   ?-    -.act
       $clr  `+>.$
@@ -154,7 +154,7 @@
   ^-  card
   :^  %poke  /invite/(scot %t ask)  [(need wom) %hood]  
   :-  %womb-invite
-  ^-  {cord invite}:womb
+  ^-  [cord invite]:womb
   =+  inv=(scot %uv (end 7 1 eny.bow))
   [inv [ask 1 0 "You have been invited to Urbit: {(trip inv)}" ""]]
 --

app/curl.hoon

@@ -2,6 +2,8 @@
 ::::  /hoon/curl/app
   ::
 /?    310
+/+  old-zuse
+=,  old-zuse
 ::
 |_  {{^ ^ ost/@ ^} $~}
 ++  poke  |*(a/{mark *} :_(+> [ost %hiss / `~ %wain a]~))

app/gh.hoon

@@ -19,6 +19,7 @@
 ::
 ::
 =,  html
+=,  eyre
 =>  |%
     ++  move  (pair bone card)
     ++  card  

app/time.hoon

@@ -2,6 +2,8 @@
 ::::  /hoon/time/app
   ::
 /?    310
+/+  old-zuse
+=,  old-zuse
 |%
 ++  card  {$wait wire @da}
 --

lib/connector.hoon

@@ -10,6 +10,9 @@
 ::  --  in `++sigh-httr` in the connector app, call `++sigh` in
 ::      this library to handle the response according to the
 ::      place.
+/+  old-zuse
+=,  old-zuse
+::
 |*  {move/mold sub-result/mold}
 =>  |%
     ::  A place consists of:
@@ -113,6 +116,7 @@
 ::
 ++  sigh
   =,  html
+  =,  eyre
   |=  {places/(list place) ren/care pax/path res/httr}
   ^-  sub-result
   =<  ?+(ren ~|([%invalid-care ren] !!) $x sigh-x, $y sigh-y)
@@ -164,5 +168,4 @@
       arch+*arch
     arch+u.-
   --
-
 --

lib/helm.hoon

@@ -166,7 +166,7 @@
   %-  emil
   %-  flop  ^-  (list card)
   =+  top=`path`/(scot %p our)/home/(scot %da now)/sys
-  :-  [%flog /reset %vega :(weld top /hoon top /ovra)]
+  :-  [%flog /reset %vega (weld top /hoon) (weld top /ovra)]
   %+  turn
     ^-  (list {p/@tas q/path})
     :~  [%$ /zuse]

sys/ovra.hoon

@@ -14,7 +14,6 @@
 ++  beam  {{p/ship q/desk r/case} s/path}               ::  global name
 ++  beak  {p/ship q/desk r/case}                        ::  garnish with beak
 ++  bone  @ud                                           ::  opaque duct
-++  care  ?($$ $u $v $w $x $y $z)                       ::  namespace mode
 ++  case                                                ::  version
           $%  {$da p/@da}                               ::  date
               {$tas p/@tas}                             ::  label
@@ -347,7 +346,7 @@
     ^-  (unit (unit (cask)))
     =>  .(fur ?^(fur fur `[[%& p.bed] ~ ~]))            ::  XX heinous
     =+  lal=(end 3 1 ron)
-    =+  ren=(care (rsh 3 1 ron))
+    =+  ren=(@t (rsh 3 1 ron))
     |-  ^-  (unit (unit (cask)))
     ?~  q.niz  ~
     ?.  =(lal p.i.q.niz)  $(q.niz t.q.niz)