urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-06 21:18:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1054 from urbit/dude-remove-trap

Browse Source 
Remove trap from %dude in ford
This commit is contained in:
pilfer-pandex 2019-02-05 11:24:38 -08:00 committed by GitHub
commit 9e8ffb29ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/test/ford.hoon
View File

@ -105,7 +105,7 @@
[%leaf "expected %dude, but got {<-.actual>}"]~ [%leaf "expected %dude, but got {<-.actual>}"]~
:: ::
%+ weld %+ weld
(expect-eq !>((error.expected)) !>((error.actual))) (expect-eq !>(error.expected) !>(error.actual))
$(expected attempt.expected, actual attempt.actual) $(expected attempt.expected, actual attempt.actual)
:: ::
%hood %hood

2
sys/vane/clay.hoon
View File

@ -1770,7 +1770,7 @@
|= [disc=disc:ford a=page] |= [disc=disc:ford a=page]
^- schematic:ford ^- schematic:ford
?. ?=($hoon p.a) [%vale [our %home] a] ?. ?=($hoon p.a) [%vale [our %home] a]
?. ?=(@t q.a) [%dude |.(>%weird-hoon<) %ride [%zpzp ~] %$ *cage] ?. ?=(@t q.a) [%dude >%weird-hoon< %ride [%zpzp ~] %$ *cage]
[%$ p.a [%atom %t ~] q.a] [%$ p.a [%atom %t ~] q.a]
:: ::
:: Verify the foreign data is of the the mark it claims to be. :: Verify the foreign data is of the the mark it claims to be.

3
sys/vane/eyre.hoon
View File

@ -1160,7 +1160,7 @@
|= [tea=whir live=? request=schematic:ford] |= [tea=whir live=? request=schematic:ford]
%+ pass-note tea %+ pass-note tea
:* %f %build live :* %f %build live
[%dude |.([%leaf "eyre: execute {<tea>}"]) request] [%dude [%leaf "eyre: execute {<tea>}"] request]
== ==
:: ::
++ add-links :: x-urbit:// urls ++ add-links :: x-urbit:// urls
@ -2075,7 +2075,6 @@
++ has-arm ~(has in (silt (sloe cor-type))) ++ has-arm ~(has in (silt (sloe cor-type)))
++ build ++ build
%^ execute-turbo %core live=%.y %^ execute-turbo %core live=%.y
:::+ %dude [|.(+)]:>%mod-samp<
^- schematic:ford ^- schematic:ford
:+ %mute :+ %mute
^- schematic:ford ^- schematic:ford

4
sys/vane/ford.hoon
View File

@ -3131,7 +3131,7 @@
:: ::
++ make-dude ++ make-dude
~% %make-dude ..^^$ ~ ~% %make-dude ..^^$ ~
|= [error=(trap tank) attempt=schematic] |= [error=tank attempt=schematic]
^- build-receipt ^- build-receipt
:: ::
=/ attempt-build=^build [date.build attempt] =/ attempt-build=^build [date.build attempt]
@ -3143,7 +3143,7 @@
?. ?=([%error *] u.attempt-result) ?. ?=([%error *] u.attempt-result)
(return-result u.attempt-result) (return-result u.attempt-result)
:: ::
(return-error [$:error message.u.attempt-result]) (return-error [error message.u.attempt-result])
:: ::
++ make-hood ++ make-hood
~% %make-hood ..^^$ ~ ~% %make-hood ..^^$ ~

2
sys/zuse.hoon
View File

@ -1214,7 +1214,7 @@
$: %dude $: %dude
:: error: a trap producing an error message to wrap the original :: error: a trap producing an error message to wrap the original
:: ::
error=(trap tank) error=tank
:: attempt: the schematic to try, whose error we wrap, if any :: attempt: the schematic to try, whose error we wrap, if any
:: ::
attempt=schematic attempt=schematic

4
tests/sys/vane/ford.hoon
View File

@ -1980,7 +1980,7 @@
++ test-dude ^- tang ++ test-dude ^- tang
:: ::
=/ schematic=schematic:ford-gate =/ schematic=schematic:ford-gate
:* %dude |.(>%test-no-error<) :* %dude >%test-no-error<
[%scry [%c care=%x bel=[[~nul %desk] /bar/foo]]] [%scry [%c care=%x bel=[[~nul %desk] /bar/foo]]]
== ==
:: ::
@ -2007,7 +2007,7 @@
++ test-dude-error ^- tang ++ test-dude-error ^- tang
:: ::
=/ schematic=schematic:ford-gate =/ schematic=schematic:ford-gate
:* %dude |.(>%in-the-error-message<) :* %dude >%in-the-error-message<
[%scry [%c care=%x bel=[[~nul %desk] /bar/foo]]] [%scry [%c care=%x bel=[[~nul %desk] /bar/foo]]]
== ==
:: ::