urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-01 14:42:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

/sys: various merge fixes

Browse Source
This commit is contained in:
Ted Blackman 2019-10-30 16:23:37 -04:00
parent 21dabb8895
commit 925489eba6
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/arvo/sys/arvo.hoon
View File

@ -258,7 +258,6 @@
++ slur-g ~/(%slur-g |=({gat/vase hil/mill} =+(%g (slur gat hil))))
++ slur-i ~/(%slur-i |=({gat/vase hil/mill} =+(%i (slur gat hil))))
++ slur-j ~/(%slur-j |=({gat/vase hil/mill} =+(%j (slur gat hil))))
++ slur-k ~/(%slur-k |=({gat/vase hil/mill} =+(%k (slur gat hil))))
++ slur-z ~/(%slur-z |=({gat/vase hil/mill} =+(%z (slur gat hil))))
::
++ slur-pro :: profiling slur
@ -274,7 +273,6 @@
$g (slur-g gat hil)
$i (slur-i gat hil)
$j (slur-j gat hil)
$k (slur-k gat hil)
==
::
++ song :: reduce metacard

2
pkg/arvo/sys/vane/behn.hoon
View File

@ -63,8 +63,6 @@
::
?: =(~ timers.state) ~| %behn-crud-no-timer^tag^error !!
::
~& %behn-crud-tag^tag
%- (slog error)
(wake `error)
:: +rest: cancel the timer at :date, then adjust unix wakeup
:: +wait: set a new timer at :date, then adjust unix wakeup

7
pkg/arvo/sys/vane/clay.hoon
View File

@ -2686,7 +2686,7 @@
%- (sloy-light ski)
=/ pur=spur
/(scot %p who)
[[151 %noun] %k our %rift da+now pur]
[[151 %noun] %j our %rift da+now pur]
::
:: Handle `%sing` requests
::
@ -4618,8 +4618,7 @@
%done
?~ error=error.q.hin
[~ ..^$]
~& [%clay-lost u.error tea]
%- (slog >tag.u.error< tang.u.error)
%- (slog >%clay-lost< >tag.u.error< tang.u.error)
[~ ..^$]
==
::
@ -4679,5 +4678,5 @@
%- (sloy-light ski)
=/ pur=spur
/(scot %p who)
[[151 %noun] %k our %rift da+now pur]
[[151 %noun] %j our %rift da+now pur]
--

2
pkg/arvo/sys/zuse.hoon
View File

@ -6747,7 +6747,7 @@
++ saxo :: autocanon
|= [our=ship now=@da who=ship]
.^ (list ship)
%k
%j
/(scot %p our)/saxo/(scot %da now)/(scot %p who)
==
:: :: ++sein:title