Skip to content

Commit

Permalink
Migrate code for the flag --incompatible_disable_depset_items (#232)
Browse files Browse the repository at this point in the history
  • Loading branch information
laurentlb committed Feb 3, 2020
1 parent e583e82 commit 1c5ed07
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion bzl_library.bzl
Expand Up @@ -24,7 +24,7 @@ StarlarkLibraryInfo = provider(
)

def _bzl_library_impl(ctx):
deps_files = [depset(x.files, order = "postorder") for x in ctx.attr.deps]
deps_files = [x.files for x in ctx.attr.deps]
all_files = depset(ctx.files.srcs, order = "postorder", transitive = deps_files)
return [
# All dependent files should be listed in both `files` and in `runfiles`;
Expand Down
2 changes: 1 addition & 1 deletion rules/native_binary.bzl
Expand Up @@ -30,7 +30,7 @@ def _impl_rule(ctx, is_windows):
copy_bash(ctx, ctx.file.src, out)
return DefaultInfo(
executable = out,
files = depset(items = [out]),
files = depset([out]),
runfiles = ctx.runfiles(
files = [out],
collect_data = True,
Expand Down
2 changes: 1 addition & 1 deletion rules/run_binary.bzl
Expand Up @@ -54,7 +54,7 @@ def _impl(ctx):
input_manifests = tool_input_mfs,
)
return DefaultInfo(
files = depset(items = ctx.outputs.outs),
files = depset(ctx.outputs.outs),
runfiles = ctx.runfiles(files = ctx.outputs.outs),
)

Expand Down

0 comments on commit 1c5ed07

Please sign in to comment.