propagate hax

Author: dzbarsky

rust/private/rust.bzl

@@ -39,6 +39,7 @@ load(
     "generate_output_diagnostics",
     "get_edition",
     "get_import_macro_deps",
+    "partition_deps",
     "transform_deps",
     "transform_sources",
 )
@@ -53,31 +54,6 @@ def _assert_no_deprecated_attributes(_ctx):
     """
     pass
 
-def _assert_correct_dep_mapping(ctx):
-    """Forces a failure if proc_macro_deps and deps are mixed inappropriately
-
-    Args:
-        ctx (ctx): The current rule's context object
-    """
-    for dep in ctx.attr.deps:
-        if rust_common.crate_info in dep:
-            if dep[rust_common.crate_info].type == "proc-macro":
-                fail(
-                    "{} listed {} in its deps, but it is a proc-macro. It should instead be in the bazel property proc_macro_deps.".format(
-                        ctx.label,
-                        dep.label,
-                    ),
-                )
-    for dep in ctx.attr.proc_macro_deps:
-        type = dep[rust_common.crate_info].type
-        if type != "proc-macro":
-            fail(
-                "{} listed {} in its proc_macro_deps, but it is not proc-macro, it is a {}. It should probably instead be listed in deps.".format(
-                    ctx.label,
-                    dep.label,
-                    type,
-                ),
-            )
 
 def _rust_library_impl(ctx):
     """The implementation of the `rust_library` rule.
@@ -148,7 +124,7 @@ def _rust_library_common(ctx, crate_type):
         list: A list of providers. See `rustc_compile_action`
     """
     _assert_no_deprecated_attributes(ctx)
-    _assert_correct_dep_mapping(ctx)
+    deps, proc_macro_deps = partition_deps(ctx)
 
     toolchain = find_toolchain(ctx)
 
@@ -195,8 +171,8 @@ def _rust_library_common(ctx, crate_type):
             not ctx.attr.disable_pipelining
         )
 
-    deps = transform_deps(ctx.attr.deps)
-    proc_macro_deps = transform_deps(ctx.attr.proc_macro_deps + get_import_macro_deps(ctx))
+    deps = transform_deps(deps)
+    proc_macro_deps = transform_deps(proc_macro_deps + get_import_macro_deps(ctx))
 
     return rustc_compile_action(
         ctx = ctx,
@@ -238,16 +214,16 @@ def _rust_binary_impl(ctx):
     """
     toolchain = find_toolchain(ctx)
     crate_name = compute_crate_name(ctx.workspace_name, ctx.label, toolchain, ctx.attr.crate_name)
-    _assert_correct_dep_mapping(ctx)
+    deps, proc_macro_deps = partition_deps(ctx)
 
     if ctx.attr.binary_name:
         output_filename = ctx.attr.binary_name
     else:
         output_filename = ctx.label.name
     output = ctx.actions.declare_file(output_filename + toolchain.binary_ext)
 
-    deps = transform_deps(ctx.attr.deps)
-    proc_macro_deps = transform_deps(ctx.attr.proc_macro_deps + get_import_macro_deps(ctx))
+    deps = transform_deps(deps)
+    proc_macro_deps = transform_deps(proc_macro_deps + get_import_macro_deps(ctx))
 
     crate_root = getattr(ctx.file, "crate_root", None)
     if not crate_root:
@@ -327,13 +303,13 @@ def _rust_test_impl(ctx):
         list: The list of providers. See `rustc_compile_action`
     """
     _assert_no_deprecated_attributes(ctx)
-    _assert_correct_dep_mapping(ctx)
+    deps, proc_macro_deps = partition_deps(ctx)
 
     toolchain = find_toolchain(ctx)
 
     crate_type = "bin"
-    deps = transform_deps(ctx.attr.deps)
-    proc_macro_deps = transform_deps(ctx.attr.proc_macro_deps + get_import_macro_deps(ctx))
+    deps = transform_deps(deps)
+    proc_macro_deps = transform_deps(proc_macro_deps + get_import_macro_deps(ctx))
 
     if ctx.attr.crate and ctx.attr.srcs:
         fail("rust_test.crate and rust_test.srcs are mutually exclusive. Update {} to use only one of these attributes".format(
@@ -1072,6 +1048,80 @@ rust_shared_library = rule(
         """),
 )
 
+# See https://github.com/bazelbuild/bazel/blob/952a7580c3fcf913371019238ef06611cead4857/src/main/starlark/builtins_bzl/common/builtin_exec_platforms.bzl#L219-L282
+_EXEC_TRANSITION_PROPAGATED = [
+    #"//command_line_option:experimental_output_directory_naming_scheme",
+    "//command_line_option:host_compilation_mode",
+    #"//command_line_option:experimental_exec_configuration_distinguisher",
+    #"//command_line_option:experimental_output_paths",
+    "//command_line_option:enable_runfiles",
+    "//command_line_option:enforce_constraints",
+    #"//command_line_option:incompatible_merge_genfiles_directory",
+    #"//command_line_option:experimental_platform_in_output_dir",
+    "//command_line_option:host_cpu",
+    #"//command_line_option:incompatible_modify_execution_info_additive",
+    "//command_line_option:include_config_fragments_provider",
+    #"//command_line_option:experimental_debug_selects_always_succeed",
+    #"//command_line_option:incompatible_check_testonly_for_output_files",
+    #"//command_line_option:incompatible_auto_exec_groups",
+    #"//command_line_option:incompatible_bazel_test_exec_run_under",
+    #"//command_line_option:experimental_writable_outputs",
+    "//command_line_option:build_runfile_manifests",
+    "//command_line_option:build_runfile_links",
+    #"//command_line_option:experimental_remotable_source_manifests",
+    #"//command_line_option:incompatible_always_include_files_in_data",
+    #"//command_line_option:experimental_strict_fileset_output",
+    "//command_line_option:strict_filesets",
+    "//command_line_option:check_visibility",
+    "//command_line_option:check_licenses",
+    "//command_line_option:host_features",
+    "//command_line_option:host_action_env",
+    "//command_line_option:archived_tree_artifact_mnemonics_filter",
+    "//command_line_option:allow_unresolved_symlinks",
+    #"//command_line_option:experimental_exec_config",
+    #"//command_line_option:experimental_exclude_defines_from_exec_config",
+    #"//command_line_option:experimental_exclude_starlark_flags_from_exec_config",
+    #"//command_line_option:experimental_propagate_custom_flag",
+    "//command_line_option:allow_analysis_failures",
+    #"//command_line_option:experimental_collect_code_coverage_for_generated_files",
+    #"//command_line_option:experimental_extended_sanity_checks",
+    #"//command_line_option:experimental_inprocess_symlink_creation",
+    #"//command_line_option:experimental_throttle_action_cache_check",
+    #"//command_line_option:experimental_use_platforms_in_output_dir_legacy_heuristic",
+    #"//command_line_option:incompatible_compact_repo_mapping_manifest",
+    #"//command_line_option:incompatible_filegroup_runfiles_for_data",
+]
+
+def _exec_transition_impl(settings, _attr):
+    transitioned = {
+        "//command_line_option:compilation_mode": settings["//command_line_option:host_compilation_mode"],
+        "//command_line_option:is exec configuration": True,
+        "//command_line_option:cpu": settings["//command_line_option:host_cpu"],
+        "//command_line_option:stamp": False,
+        "//command_line_option:action_env": settings["//command_line_option:host_action_env"],
+        "//command_line_option:features": settings["//command_line_option:host_features"],
+    }
+
+    for opt in _EXEC_TRANSITION_PROPAGATED:
+        transitioned[opt] = settings[opt]
+
+    return transitioned
+
+_exec_transition = transition(
+    inputs = [
+        "//command_line_option:features",
+    ] + _EXEC_TRANSITION_PROPAGATED,
+    outputs = [
+        "//command_line_option:compilation_mode",
+        "//command_line_option:is exec configuration",
+        "//command_line_option:cpu",
+        "//command_line_option:stamp",
+        "//command_line_option:features",
+        "//command_line_option:action_env",
+    ] + _EXEC_TRANSITION_PROPAGATED,
+    implementation = _exec_transition_impl,
+)
+
 def _proc_macro_dep_transition_impl(settings, _attr):
     if settings["//rust/private:is_proc_macro_dep_enabled"]:
         return {"//rust/private:is_proc_macro_dep": True}
@@ -1106,6 +1156,7 @@ rust_proc_macro = rule(
             cfg = _proc_macro_dep_transition,
         ),
     ),
+    cfg = _exec_transition,
     fragments = ["cpp"],
     toolchains = [
         str(Label("//rust:toolchain_type")),

rust/private/rustc.bzl

@@ -229,7 +229,7 @@ def collect_deps(
 
     Args:
         deps (list): The deps from ctx.attr.deps.
-        proc_macro_deps (list): The proc_macro deps from ctx.attr.proc_macro_deps.
+        proc_macro_deps (list): The proc_macro_deps from partition_deps(ctx).
         aliases (dict): A dict mapping aliased targets to their actual Crate information.
 
     Returns:

rust/private/rustdoc_test.bzl

@@ -18,7 +18,7 @@ load("@rules_cc//cc/common:cc_info.bzl", "CcInfo")
 load("//rust/private:common.bzl", "rust_common")
 load("//rust/private:providers.bzl", "CrateInfo")
 load("//rust/private:rustdoc.bzl", "rustdoc_compile_action")
-load("//rust/private:utils.bzl", "dedent", "find_toolchain", "transform_deps")
+load("//rust/private:utils.bzl", "dedent", "find_toolchain", "partition_deps", "transform_deps")
 
 def _construct_writer_arguments(ctx, test_runner, opt_test_params, action, crate_info):
     """Construct arguments and environment variables specific to `rustdoc_test_writer`.
@@ -110,8 +110,9 @@ def _rust_doc_test_impl(ctx):
     toolchain = find_toolchain(ctx)
 
     crate = ctx.attr.crate[rust_common.crate_info]
-    deps = transform_deps(ctx.attr.deps)
-    proc_macro_deps = transform_deps(ctx.attr.proc_macro_deps)
+    deps, proc_macro_deps = partition_deps(ctx)
+    deps = transform_deps(deps)
+    proc_macro_deps = transform_deps(proc_macro_deps)
 
     crate_info = rust_common.create_crate_info(
         name = crate.name,

rust/private/utils.bzl

@@ -498,6 +498,28 @@ def is_exec_configuration(ctx):
     # TODO(djmarcin): Is there any better way to determine cfg=exec?
     return ctx.genfiles_dir.path.find("-exec") != -1
 
+def partition_deps(ctx):
+    """Split deps into normal deps and proc_macro_deps.
+
+    Args:
+        ctx (ctx): The current rule's context object
+
+    Returns:
+        deps, proc_macro_deps
+    """
+    if ctx.attr.proc_macro_deps:
+        print("`proc_macro_deps` attribute is deprecated; all deps can go in `deps`")
+
+    deps = []
+    proc_macro_deps = []
+    for dep in ctx.attr.deps + ctx.attr.proc_macro_deps:
+        if CrateInfo in dep and dep[CrateInfo].type == "proc-macro":
+            proc_macro_deps.append(dep)
+        else:
+            deps.append(dep)
+
+    return deps, proc_macro_deps
+
 def transform_deps(deps):
     """Transforms a [Target] into [DepVariantInfo].
 

test/unit/is_proc_macro_dep/is_proc_macro_dep_test.bzl

@@ -65,7 +65,7 @@ is_proc_macro_dep_is_not_in_env_for_top_level_action_test = analysistest.make(_i
 def _is_proc_macro_dep_is_false_for_proc_macro(ctx):
     env = analysistest.begin(ctx)
     tut = analysistest.target_under_test(env)
-    proc_macro_dep_action = [a for a in tut[DepActionsInfo].actions if str(a) == "action 'Compiling Rust proc-macro proc_macro_crate (1 files)'"][0]
+    proc_macro_dep_action = [a for a in tut[DepActionsInfo].actions if str(a) == "action 'Compiling Rust proc-macro proc_macro_crate (1 files) [for tool]'"][0]
     asserts.equals(env, proc_macro_dep_action.env["BAZEL_RULES_RUST_IS_PROC_MACRO_DEP"], "0")
     return analysistest.end(env)
 
@@ -83,7 +83,7 @@ is_proc_macro_dep_is_false_for_top_level_library_test = analysistest.make(_is_pr
 def _is_proc_macro_dep_is_true_for_proc_macro_dep(ctx):
     env = analysistest.begin(ctx)
     tut = analysistest.target_under_test(env)
-    proc_macro_dep_action = [a for a in tut[DepActionsInfo].actions if str(a) == "action 'Compiling Rust rlib proc_macro_dep (1 files)'"][0]
+    proc_macro_dep_action = [a for a in tut[DepActionsInfo].actions if str(a) == "action 'Compiling Rust rlib proc_macro_dep (1 files) [for tool]'"][0]
     asserts.equals(env, proc_macro_dep_action.env["BAZEL_RULES_RUST_IS_PROC_MACRO_DEP"], "1")
     return analysistest.end(env)