Merge the erlc_opts rule into the erlc_opts_file rule

There was no need to have two rules
rabbitmq · Jul 29, 2024 · b9ccd94 · b9ccd94
1 parent de2eb26
commit b9ccd94
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 58 deletions.
diff --git a/erlang_bytecode2.bzl b/erlang_bytecode2.bzl
@@ -2,13 +2,6 @@ load(
     "//private:erlang_bytecode2.bzl",
     _erlang_bytecode = "erlang_bytecode",
 )
-load(
-    "//private:erlc_opts.bzl",
-    _ErlcOptsInfo = "ErlcOptsInfo",
-    _erlc_opts = "erlc_opts",
-)
-
-ErlcOptsInfo = _ErlcOptsInfo
 
 def erlang_bytecode(
         srcs = [],
@@ -33,9 +26,6 @@ def erlang_bytecode(
         **kwargs
     )
 
-def erlc_opts(**kwargs):
-    _erlc_opts(**kwargs)
-
 def _beam(p):
     (_, _, basename) = p.rpartition("/")
     return basename.removesuffix(".erl") + ".beam"
diff --git a/erlc_opts_file.bzl b/erlc_opts_file.bzl
@@ -3,5 +3,10 @@ load(
     _erlc_opts_file = "erlc_opts_file",
 )
 
-def erlc_opts_file(**kwargs):
-    _erlc_opts_file(**kwargs)
+def erlc_opts_file(
+        out = "erlc_opts_file",
+        **kwargs):
+    _erlc_opts_file(
+        out = out,
+        **kwargs
+    )
diff --git a/examples/basic/BUILD.bazel b/examples/basic/BUILD.bazel
@@ -6,7 +6,6 @@ load("@rules_erlang//:erlc_opts_file.bzl", "erlc_opts_file")
 load("@rules_erlang//:eunit2.bzl", "eunit")
 load("@rules_erlang//:shell.bzl", "shell")
 load("@rules_erlang//:xref.bzl", "xref")
-load("@rules_erlang//private:erlc_opts.bzl", "erlc_opts")
 load("@rules_erlang//private:extract_app.bzl", "extract_app")
 
 APP_NAME = "basic"
@@ -28,20 +27,18 @@ erlc_opts_file(
     }),
 )
 
-TEST_ERLC_OPTS = [
-    "+debug_info",
-    "-DTEST=1",
-] + select({
-    "@rules_erlang//:debug_build": [],
-    "//conditions:default": [
-        "+deterministic",
-    ],
-})
-
 erlc_opts_file(
     name = "test_erlc_opts",
     out = "test_erlc_opts_file",
-    values = TEST_ERLC_OPTS,
+    values = [
+        "+debug_info",
+        "-DTEST=1",
+    ] + select({
+        "@rules_erlang//:debug_build": [],
+        "//conditions:default": [
+            "+deterministic",
+        ],
+    }),
 )
 
 erlang_app_sources(
@@ -105,12 +102,6 @@ dialyze(
     plt = ":deps_plt",
 )
 
-erlc_opts(
-    name = "test_erlc_opts_",
-    testonly = True,
-    values = TEST_ERLC_OPTS,
-)
-
 erlang_bytecode(
     name = "test_helpers",
     testonly = True,
@@ -121,7 +112,7 @@ erlang_bytecode(
         exclude = ["test/**/*_SUITE.erl"],
     ),
     dest = "test",
-    erlc_opts = ":test_erlc_opts_",
+    erlc_opts = ":test_erlc_opts",
 )
 
 eunit(

diff --git a/private/erlang_bytecode2.bzl b/private/erlang_bytecode2.bzl
@@ -1,7 +1,7 @@
 load("//:erlang_app_info.bzl", "ErlangAppInfo", "flat_deps")
 load("//:util.bzl", "path_join")
 load(":erlang_bytecode.bzl", "unique_dirnames")
-load(":erlc_opts.bzl", "ErlcOptsInfo")
+load(":erlc_opts_file.bzl", "ErlcOptsInfo")
 load(":util.bzl", "erl_libs_contents")
 load(
     "//tools:erlang_toolchain.bzl",

diff --git a/private/erlc_opts.bzl b/private/erlc_opts.bzl
diff --git a/private/erlc_opts_file.bzl b/private/erlc_opts_file.bzl
@@ -1,3 +1,10 @@
+ErlcOptsInfo = provider(
+    doc = "Reusable set of erlc options",
+    fields = {
+        "values": "Strings to be passed as additional options to erlc",
+    },
+)
+
 def _impl(ctx):
     args = ctx.actions.args()
     args.add_all(ctx.attr.values)
@@ -7,10 +14,17 @@ def _impl(ctx):
         content = args,
     )
 
+    return [
+        ErlcOptsInfo(values = ctx.attr.values),
+    ]
+
 erlc_opts_file = rule(
     implementation = _impl,
     attrs = {
         "values": attr.string_list(),
-        "out": attr.output(),
+        "out": attr.output(
+            mandatory = True,
+        ),
     },
+    provides = [ErlcOptsInfo],
 )
diff --git a/tools/app_file_tool/BUILD.bazel b/tools/app_file_tool/BUILD.bazel
@@ -1,7 +1,10 @@
 load(
     "//:erlang_bytecode2.bzl",
     "erlang_bytecode",
-    "erlc_opts",
+)
+load(
+    "//:erlc_opts_file.bzl",
+    "erlc_opts_file",
 )
 load(
     "//private:escript_flat.bzl",
@@ -12,7 +15,7 @@ load(
     "DEFAULT_ERLC_OPTS",
 )
 
-erlc_opts(
+erlc_opts_file(
     name = "erlc_opts",
     values = DEFAULT_ERLC_OPTS,
 )

diff --git a/tools/compile_first/BUILD.bazel b/tools/compile_first/BUILD.bazel
@@ -1,7 +1,10 @@
 load(
     "//:erlang_bytecode2.bzl",
     "erlang_bytecode",
-    "erlc_opts",
+)
+load(
+    "//:erlc_opts_file.bzl",
+    "erlc_opts_file",
 )
 load(
     "//private:escript_flat.bzl",
@@ -12,7 +15,7 @@ load(
     "DEFAULT_ERLC_OPTS",
 )
 
-erlc_opts(
+erlc_opts_file(
     name = "erlc_opts",
     values = DEFAULT_ERLC_OPTS,
 )

diff --git a/tools/coverdata_to_lcov/BUILD.bazel b/tools/coverdata_to_lcov/BUILD.bazel
@@ -1,7 +1,10 @@
 load(
     "//:erlang_bytecode2.bzl",
     "erlang_bytecode",
-    "erlc_opts",
+)
+load(
+    "//:erlc_opts_file.bzl",
+    "erlc_opts_file",
 )
 load(
     "//private:escript_flat.bzl",
@@ -12,7 +15,7 @@ load(
     "DEFAULT_ERLC_OPTS",
 )
 
-erlc_opts(
+erlc_opts_file(
     name = "erlc_opts",
     values = DEFAULT_ERLC_OPTS,
 )