Skip to content

Commit b5d32cd

Browse files
authored
cleanup: Remove uses of legacy struct providers (bazel-contrib#1812)
The code still supported legacy struct providers, although none were generated or used.
1 parent c11045d commit b5d32cd

File tree

3 files changed

+7
-17
lines changed

3 files changed

+7
-17
lines changed

python/private/common/py_executable.bzl

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ def py_executable_base_impl(ctx, *, semantics, is_test, inherited_environment =
183183
data_runfiles = runfiles_details.data_runfiles.merge(extra_exec_runfiles),
184184
)
185185

186-
legacy_providers, modern_providers = _create_providers(
186+
return _create_providers(
187187
ctx = ctx,
188188
executable = executable,
189189
runfiles_details = runfiles_details,
@@ -197,10 +197,6 @@ def py_executable_base_impl(ctx, *, semantics, is_test, inherited_environment =
197197
semantics = semantics,
198198
output_groups = exec_result.output_groups,
199199
)
200-
return struct(
201-
legacy_providers = legacy_providers,
202-
providers = modern_providers,
203-
)
204200

205201
def _get_build_info(ctx, cc_toolchain):
206202
build_info_files = py_internal.cc_toolchain_build_info_files(cc_toolchain)
@@ -749,9 +745,7 @@ def _create_providers(
749745
semantics: BinarySemantics struct; see create_binary_semantics()
750746
751747
Returns:
752-
A two-tuple of:
753-
1. A dict of legacy providers.
754-
2. A list of modern providers.
748+
A list of modern providers.
755749
"""
756750
providers = [
757751
DefaultInfo(
@@ -821,13 +815,13 @@ def _create_providers(
821815
providers.append(builtin_py_info)
822816
providers.append(create_output_group_info(py_info.transitive_sources, output_groups))
823817

824-
extra_legacy_providers, extra_providers = semantics.get_extra_providers(
818+
extra_providers = semantics.get_extra_providers(
825819
ctx,
826820
main_py = main_py,
827821
runtime_details = runtime_details,
828822
)
829823
providers.extend(extra_providers)
830-
return extra_legacy_providers, providers
824+
return providers
831825

832826
def _create_run_environment_info(ctx, inherited_environment):
833827
expanded_env = {}

python/private/common/py_executable_bazel.bzl

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,12 @@ def create_executable_rule(*, attrs, **kwargs):
9999

100100
def py_executable_bazel_impl(ctx, *, is_test, inherited_environment):
101101
"""Common code for executables for Bazel."""
102-
result = py_executable_base_impl(
102+
return py_executable_base_impl(
103103
ctx = ctx,
104104
semantics = create_binary_semantics_bazel(),
105105
is_test = is_test,
106106
inherited_environment = inherited_environment,
107107
)
108-
return struct(
109-
providers = result.providers,
110-
**result.legacy_providers
111-
)
112108

113109
def create_binary_semantics_bazel():
114110
return create_binary_semantics_struct(
@@ -143,7 +139,7 @@ def _get_debugger_deps(ctx, runtime_details):
143139

144140
def _get_extra_providers(ctx, main_py, runtime_details):
145141
_ = ctx, main_py, runtime_details # @unused
146-
return {}, []
142+
return []
147143

148144
def _get_stamp_flag(ctx):
149145
# NOTE: Undocumented API; private to builtins

python/private/common/py_test_rule_bazel.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def _py_test_impl(ctx):
4545
is_test = True,
4646
inherited_environment = ctx.attr.env_inherit,
4747
)
48-
maybe_add_test_execution_info(providers.providers, ctx)
48+
maybe_add_test_execution_info(providers, ctx)
4949
return providers
5050

5151
py_test = create_executable_rule(

0 commit comments

Comments
 (0)