Skip to content
This repository was archived by the owner on Feb 6, 2024. It is now read-only.

Return providers instead of struct from rule impl functions #300

Merged
alex1545 merged 5 commits into from
Apr 1, 2019
Merged

Return providers instead of struct from rule impl functions #300

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9642aec
Return providers instead of struct from rule impl functions
alex1545 Mar 29, 2019
28ef1ad
fix buildifier
alex1545 Mar 29, 2019
8c5647c
access default_runfiles via DefaultInfo provider
alex1545 Apr 1, 2019
49d1ef4
use transitive_files in the returned provider
alex1545 Apr 1, 2019
1d98c1c
tarsitive_files takes in a depset of files
alex1545 Apr 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions k8s/object.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,14 @@ def _impl(ctx):
output = ctx.outputs.executable,
)

return struct(runfiles = ctx.runfiles(files = [
ctx.executable.resolver,
ctx.outputs.substituted,
] + list(ctx.attr.resolver.default_runfiles.files) + all_inputs))
return [
DefaultInfo(
runfiles = ctx.runfiles(files = [
ctx.executable.resolver,
ctx.outputs.substituted,
] + list(ctx.attr.resolver.default_runfiles.files) + all_inputs),
Comment thread
alex1545 marked this conversation as resolved.
Outdated
),
]

def _resolve(ctx, string, output):
stamps = [ctx.info_file, ctx.version_file]
Expand Down Expand Up @@ -232,7 +236,11 @@ def _common_impl(ctx):
output = ctx.outputs.executable,
)

return struct(runfiles = ctx.runfiles(files = files))
return [
DefaultInfo(
runfiles = ctx.runfiles(files = files),
),
]

_common_attrs = {
# We allow cluster to be omitted, and we just
Expand Down Expand Up @@ -274,10 +282,14 @@ def _reverse(ctx):
output = ctx.outputs.executable,
)

return struct(runfiles = ctx.runfiles(files = [
ctx.executable.reverser,
ctx.file.template,
] + list(ctx.attr.reverser.default_runfiles.files)))
return [
DefaultInfo(
runfiles = ctx.runfiles(files = [
ctx.executable.reverser,
ctx.file.template,
] + list(ctx.attr.reverser.default_runfiles.files)),
Comment thread
alex1545 marked this conversation as resolved.
Outdated
),
]

_reversed = rule(
attrs = _add_dicts(
Expand Down
6 changes: 5 additions & 1 deletion k8s/objects.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@ def _run_all_impl(ctx):
for obj in ctx.attr.objects:
runfiles += list(obj.default_runfiles.files)

return struct(runfiles = ctx.runfiles(files = runfiles))
return [
DefaultInfo(
runfiles = ctx.runfiles(files = runfiles),
),
]

_run_all = rule(
attrs = {
Expand Down