rules: Perform disjoint map union in field_* expressions

... and replace all instances where the field_*_list variant
of those expressions is used solely for the purpose of
performing the disjoint union manually.

1 files changed, 4 insertions, 7 deletions

diff --git a/CC/RULES b/CC/RULES
index cb13f98..0e9a694 100644
--- a/CC/RULES
+++ b/CC/RULES
@@ -117,17 +117,14 @@
     }
   , "artifacts_doc": ["The single tree artifact staged to the given location"]
   , "runfiles_doc": ["Same as artifacts"]
-  , "imports": {"runfiles_list": ["./", "..", "field_runfiles_list"]}
+  , "imports": {"runfiles": ["./", "..", "field_runfiles"]}
   , "expression":
     { "type": "let*"
     , "bindings":
       [ [ "hdrs"
-        , { "type": "disjoint_map_union"
-          , "$1":
-            { "type": "let*"
-            , "bindings": [["fieldname", "hdrs"]]
-            , "body": {"type": "CALL_EXPRESSION", "name": "runfiles_list"}
-            }
+        , { "type": "let*"
+          , "bindings": [["fieldname", "hdrs"]]
+          , "body": {"type": "CALL_EXPRESSION", "name": "runfiles"}
           }
         ]
       , [ "stage"