From 9e7f2b68357dc1fbd073244e5a242a8317c8207d Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <klaus.aehlig@huawei.com>
Date: Tue, 5 Nov 2024 16:27:50 +0100
Subject: Prefer built-in "nub_left"

Now that justbuild 1.4 is available, the workaround of defining
"nub_left" in terms of "reverse" and "nub_right" is no longer
necessary.
---
 CC/RULES       | 18 +++++++-----------
 CC/proto/RULES | 18 +++++++-----------
 2 files changed, 14 insertions(+), 22 deletions(-)

(limited to 'CC')

diff --git a/CC/RULES b/CC/RULES
index 85c7456..0f1b0ff 100644
--- a/CC/RULES
+++ b/CC/RULES
@@ -99,7 +99,6 @@
     , "base-provides-++": "defaults-base-provides-++"
     , "base-provides-list": "defaults-base-provides-list"
     , "artifacts_list": ["./", "..", "field_artifacts_list"]
-    , "nub_left": ["", "nub_left"]
     , "compile-deps": "compile-deps"
     , "compile-args-deps": "compile-args-deps"
     , "link-deps": "link-deps"
@@ -180,17 +179,14 @@
         ]
       , ["provider", "PATH"]
       , [ "PATH"
-        , { "type": "++"
+        , { "type": "nub_left"
           , "$1":
-            [ {"type": "var", "name": "PATH"}
-            , {"type": "CALL_EXPRESSION", "name": "base-provides-++"}
-            ]
-          }
-        ]
-      , [ "PATH"
-        , { "type": "let*"
-          , "bindings": [["list", {"type": "var", "name": "PATH"}]]
-          , "body": {"type": "CALL_EXPRESSION", "name": "nub_left"}
+            { "type": "++"
+            , "$1":
+              [ {"type": "var", "name": "PATH"}
+              , {"type": "CALL_EXPRESSION", "name": "base-provides-++"}
+              ]
+            }
           }
         ]
       , ["provider", "ENV"]
diff --git a/CC/proto/RULES b/CC/proto/RULES
index 2e4b1d3..07b2dad 100644
--- a/CC/proto/RULES
+++ b/CC/proto/RULES
@@ -83,7 +83,6 @@
     , "base-provides-++": ["./", "..", "defaults-base-provides-++"]
     , "base-provides-list": ["./", "..", "defaults-base-provides-list"]
     , "artifacts_list": ["", "field_artifacts_list"]
-    , "nub_left": ["", "nub_left"]
     , "compile-deps": ["CC", "compile-deps"]
     , "compile-args-deps": ["CC", "compile-args-deps"]
     , "link-deps": ["CC", "link-deps"]
@@ -137,17 +136,14 @@
         ]
       , ["provider", "PATH"]
       , [ "PATH"
-        , { "type": "++"
+        , { "type": "nub_left"
           , "$1":
-            [ {"type": "var", "name": "PATH"}
-            , {"type": "CALL_EXPRESSION", "name": "base-provides-++"}
-            ]
-          }
-        ]
-      , [ "PATH"
-        , { "type": "let*"
-          , "bindings": [["list", {"type": "var", "name": "PATH"}]]
-          , "body": {"type": "CALL_EXPRESSION", "name": "nub_left"}
+            { "type": "++"
+            , "$1":
+              [ {"type": "var", "name": "PATH"}
+              , {"type": "CALL_EXPRESSION", "name": "base-provides-++"}
+              ]
+            }
           }
         ]
       , ["provider", "ENV"]
-- 
cgit v1.2.3