chore(link): return executable File from link_action

And move environment handling to callers.

Author: yanok

d/private/rules/BUILD.bazel

@@ -15,6 +15,7 @@ bzl_library(
     deps = [
         "//d/private/rules:compile",
         "//d/private/rules:link",
+        "@bazel_lib//lib:expand_make_vars",
     ],
 )
 
@@ -68,7 +69,6 @@ bzl_library(
     ],
     deps = [
         "//d/private/rules:cc_toolchain",
-        "@bazel_lib//lib:expand_make_vars",
         "@rules_cc//cc:defs_bzl",
     ],
 )
@@ -83,6 +83,7 @@ bzl_library(
     deps = [
         "//d/private/rules:compile",
         "//d/private/rules:link",
+        "@bazel_lib//lib:expand_make_vars",
         "@rules_cc//cc:find_cc_toolchain_bzl",
     ],
 )

d/private/rules/binary.bzl

@@ -1,13 +1,25 @@
 """D test rule for compiling binaries."""
 
+load("@bazel_lib//lib:expand_make_vars.bzl", "expand_variables")
 load("@rules_cc//cc:find_cc_toolchain.bzl", "use_cc_toolchain")
 load("//d/private/rules:compile.bzl", "TARGET_TYPE", "compilation_action", "runnable_attrs")
 load("//d/private/rules:link.bzl", "link_action")
 
 def _d_binary_impl(ctx):
     """Implementation of d_binary rule."""
     d_info = compilation_action(ctx, target_type = TARGET_TYPE.BINARY)
-    return link_action(ctx, d_info)
+    output = link_action(ctx, d_info)
+    env_with_expansions = {
+        k: expand_variables(ctx, ctx.expand_location(v, ctx.files.data), [output], "env")
+        for k, v in ctx.attr.env.items()
+    }
+    return [
+        DefaultInfo(
+            executable = output,
+            runfiles = ctx.runfiles(files = ctx.files.data),
+        ),
+        RunEnvironmentInfo(environment = env_with_expansions),
+    ]
 
 d_binary = rule(
     implementation = _d_binary_impl,

d/private/rules/link.bzl

@@ -3,7 +3,6 @@ Linking action for D rules.
 
 """
 
-load("@bazel_lib//lib:expand_make_vars.bzl", "expand_variables")
 load("@rules_cc//cc:defs.bzl", "cc_common")
 load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//d/private/rules:cc_toolchain.bzl", "find_cc_toolchain_for_linking")
@@ -15,9 +14,7 @@ def link_action(ctx, d_info):
         ctx: The rule context.
         d_info: The DInfo provider containing the linking context.
     Returns:
-        List of providers:
-            - DefaultInfo: The linked binary.
-            - RunEnvironmentInfo: The environment variables for the linked binary.
+        A File for the linked binary.
     """
     toolchain = ctx.toolchains["//d:toolchain_type"].d_toolchain_info
     cc_linker_info = find_cc_toolchain_for_linking(ctx)
@@ -28,24 +25,12 @@ def link_action(ctx, d_info):
     compilation_outputs = cc_common.create_compilation_outputs(
         objects = depset(direct = [d_info.compilation_output]),
     )
-    res = cc_common.link(
+    return cc_common.link(
         name = ctx.label.name,
         actions = ctx.actions,
         feature_configuration = cc_linker_info.feature_configuration,
         cc_toolchain = cc_linker_info.cc_toolchain,
         compilation_outputs = compilation_outputs,
         linking_contexts = linking_contexts,
         user_link_flags = toolchain.linker_flags + ctx.attr.linkopts + d_info.linker_flags.to_list(),
-    )
-    output = res.executable
-    env_with_expansions = {
-        k: expand_variables(ctx, ctx.expand_location(v, ctx.files.data), [output], "env")
-        for k, v in ctx.attr.env.items()
-    }
-    return [
-        DefaultInfo(
-            executable = output,
-            runfiles = ctx.runfiles(files = ctx.files.data),
-        ),
-        RunEnvironmentInfo(environment = env_with_expansions),
-    ]
+    ).executable

d/private/rules/test.bzl

@@ -1,13 +1,25 @@
 """D test rule for compiling and running D unit tests."""
 
+load("@bazel_lib//lib:expand_make_vars.bzl", "expand_variables")
 load("@rules_cc//cc:find_cc_toolchain.bzl", "use_cc_toolchain")
 load("//d/private/rules:compile.bzl", "TARGET_TYPE", "compilation_action", "runnable_attrs")
 load("//d/private/rules:link.bzl", "link_action")
 
 def _d_test_impl(ctx):
     """Implementation of d_test rule."""
     d_info = compilation_action(ctx, target_type = TARGET_TYPE.TEST)
-    return link_action(ctx, d_info)
+    output = link_action(ctx, d_info)
+    env_with_expansions = {
+        k: expand_variables(ctx, ctx.expand_location(v, ctx.files.data), [output], "env")
+        for k, v in ctx.attr.env.items()
+    }
+    return [
+        DefaultInfo(
+            executable = output,
+            runfiles = ctx.runfiles(files = ctx.files.data),
+        ),
+        RunEnvironmentInfo(environment = env_with_expansions),
+    ]
 
 d_test = rule(
     implementation = _d_test_impl,