diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-11-06 14:45:05 +0100 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2024-11-06 14:45:05 +0100 |
| commit | 2b07a15b20ed814f253ec3bc7f0ee089ccd066f2 (patch) | |
| tree | 9f82bf2e8ee68092eac3431b3423217ddfb531b6 /shell | |
| parent | 5803ce704eb9cf9c30235e82856ed738486256e1 (diff) | |
| parent | 1e099fbbb5648177ceded11a7a56e6ca9e9103ac (diff) | |
| download | rules-cc-2b07a15b20ed814f253ec3bc7f0ee089ccd066f2.tar.gz | |
Merge branch 'just-rules' into rules
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/RULES | 44 | ||||
| -rw-r--r-- | shell/test/RULES | 17 |
2 files changed, 23 insertions, 38 deletions
diff --git a/shell/RULES b/shell/RULES index 29b670e..7f53a4b 100644 --- a/shell/RULES +++ b/shell/RULES @@ -116,44 +116,32 @@ } ] , [ "PATH" - , { "type": "reverse" + , { "type": "nub_left" , "$1": - { "type": "nub_right" + { "type": "++" , "$1": - { "type": "reverse" - , "$1": - { "type": "++" - , "$1": - [ {"type": "FIELD", "name": "PATH"} - , { "type": "let*" - , "bindings": [["provider", "PATH"]] - , "body": - {"type": "CALL_EXPRESSION", "name": "base-provides-++"} - } - ] + [ {"type": "FIELD", "name": "PATH"} + , { "type": "let*" + , "bindings": [["provider", "PATH"]] + , "body": + {"type": "CALL_EXPRESSION", "name": "base-provides-++"} } - } + ] } } ] , [ "bin dirs" - , { "type": "reverse" + , { "type": "nub_left" , "$1": - { "type": "nub_right" + { "type": "++" , "$1": - { "type": "reverse" - , "$1": - { "type": "++" - , "$1": - [ {"type": "FIELD", "name": "bin dirs"} - , { "type": "let*" - , "bindings": [["provider", "bin dirs"]] - , "body": - {"type": "CALL_EXPRESSION", "name": "base-provides-++"} - } - ] + [ {"type": "FIELD", "name": "bin dirs"} + , { "type": "let*" + , "bindings": [["provider", "bin dirs"]] + , "body": + {"type": "CALL_EXPRESSION", "name": "base-provides-++"} } - } + ] } } ] diff --git a/shell/test/RULES b/shell/test/RULES index 1c069dc..bab1d8b 100644 --- a/shell/test/RULES +++ b/shell/test/RULES @@ -331,19 +331,16 @@ } ] , [ "artifacts" - , { "type": "map_union" + , { "type": "`" , "$1": - [ { "type": "singleton_map" - , "key": "pwd" - , "value": {"type": "BLOB", "data": "/summary"} - } - , {"type": "var", "name": "summary"} - , { "type": "singleton_map" - , "key": "work" - , "value": + { "pwd": + {"type": ",", "$1": {"type": "BLOB", "data": "/summary"}} + , "work": + { "type": "," + , "$1": {"type": "TREE", "$1": {"type": "var", "name": "attempts"}} } - ] + } } ] , [ "runfiles" |