From 475fe182dfeefd2bfacf0abcd41a265955baa5ab Mon Sep 17 00:00:00 2001
From: Anton Dyudin <ohAitch@gmail.com>
Date: Mon, 19 Jan 2015 16:07:31 -0800
Subject: [PATCH] De-rust shell

---
 arvo/dill.hoon              |  2 +-
 arvo/gall.hoon              | 25 +++++++++++++------------
 main/app/poke/core.hook     |  1 +
 main/app/shell/core.hook    |  1 +
 main/app/terminal/core.hook |  8 +++-----
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/arvo/dill.hoon b/arvo/dill.hoon
index 2d9b26497..152b0830e 100644
--- a/arvo/dill.hoon
+++ b/arvo/dill.hoon
@@ -326,7 +326,7 @@
       =.  mos  :_(mos [hen %pass tea %g %took [our /terminal] our])
       ?>  ?=(%term-line +>-.sih)
       =.  +>.$
-        =+  lis=?-(-.+.sih %rust (scag 1.000 r.q.sih), %rush r.q.sih)
+        =+  lis=(scag 1.000 r.q.sih)
         =-  (furl (zing (turn (flop lis) -)))
         |=  a=tark
         ^-  wall
diff --git a/arvo/gall.hoon b/arvo/gall.hoon
index 663f488ab..6235d22d7 100644
--- a/arvo/gall.hoon
+++ b/arvo/gall.hoon
@@ -696,18 +696,19 @@
       ++  deal                                          ::  reboot
         ^+  .
         =.  tik.sat  +(tik.sat)
-        =+  pys=(~(tap by sup.sat) ~)
-        ::  ~&  [%gall-deal tik.sat pys]
-        |-  ^+  +>.$
-        ?~  pys  +>.$
-        =.  +>.$  $(pys t.pys)
-        %_    +>.$
-            mow
-          :_  mow
-          :+  (able p.i.pys)
-            %slip 
-          [%g %show [our imp] q.i.pys]
-        ==
+        .
+        ::  =+  pys=(~(tap by sup.sat) ~)
+        ::  ::  ~&  [%gall-deal tik.sat pys]
+        ::  |-  ^+  +>.$
+        ::  ?~  pys  +>.$
+        ::  =.  +>.$  $(pys t.pys)
+        ::  %_    +>.$
+        ::      mow
+        ::    :_  mow
+        ::    :+  (able p.i.pys)
+        ::      %slip 
+        ::    [%g %show [our imp] q.i.pys]
+        ::  ==
       ::
       ++  deff
         |=  [wir=wire hon=duct caq=vase]
diff --git a/main/app/poke/core.hook b/main/app/poke/core.hook
index 24aca97fa..d332e7334 100644
--- a/main/app/poke/core.hook
+++ b/main/app/poke/core.hook
@@ -7,6 +7,7 @@
 ++  pock-poke-args
   |=  [ost=bone @ a=type b=?(mess [her=ship mess])]
   =-  :_(+>.$ [ost %pass / %g %mess -]~)
+  ^-  [p=[ship path] q=ship r=cage]
   ?^  |2.b  [[her p]:b our -.q.b (slot 29 [a b])]       ::  +.&3
   [[our p.b] our -.q.b (slot 13 [a b])]                 ::  +.&2
 ::
diff --git a/main/app/shell/core.hook b/main/app/shell/core.hook
index 09faaf30f..44d076905 100644
--- a/main/app/shell/core.hook
+++ b/main/app/shell/core.hook
@@ -450,6 +450,7 @@
     ::
         %out
       ?.  ?=(?(%rust %rush) +<.sih)  +>.$
+      =>  .(+<.sih %rush)
       ?:  ?=(%prompt p.sih)
         ?:  (~(has by pip) cil)  +>.$
         =.  pot  (~(put by pot) cil (,[cord prom cord] q.sih))
diff --git a/main/app/terminal/core.hook b/main/app/terminal/core.hook
index 8b6804f72..17b59b306 100644
--- a/main/app/terminal/core.hook
+++ b/main/app/terminal/core.hook
@@ -18,7 +18,6 @@
   ==                                                    ::
 ++  gift                                                ::
   $%  [%rush gilt]                                      ::
-      [%rust gilt]                                      ::
       [%init p=@p]                                      ::
       [%logo @]                                         ::
       [%mean p=ares]                                    ::
@@ -51,7 +50,6 @@
       [%logo @]                                         ::
       [%mean p=ares]                                    ::
       [%nice ~]                                         ::
-      [%rust p=%term-line q=term-line]                  ::
       [%rush p=%term-line q=term-line]                  ::
       [%sage p=path q=*]                                ::
       [%verb ~]                                         ::
@@ -119,8 +117,8 @@
         mow
       :_  mow
       ?-  gal
-          %term   [ost %give %rust %hymn page]          ::  hymn front end
-          %lines  [ost %give %rust %term-line tel]      ::  term-line output
+          %term   [ost %give %rush %hymn page]          ::  hymn front end
+          %lines  [ost %give %rush %term-line tel]      ::  term-line output
       == 
     ==
   ::
@@ -175,7 +173,7 @@
         %resp
       ?+    +<.sih  !!
           %nice  +>.$
-          ?(%rust %rush)
+          %rush
         =.  p.q.sih  ?^(q.q.sih p.tel p.q.sih)          ::  XX prompt hack
         %_  +>.$
           mow  :-  [ost %pass [%resp pax] %g %took [our.hid [auc imp.hid]] you]