From 1c5ed0706a8e2f73116e128184be64a99e66e83d Mon Sep 17 00:00:00 2001 From: Laurent Le Brun Date: Mon, 3 Feb 2020 16:45:44 +0100 Subject: [PATCH] Migrate code for the flag --incompatible_disable_depset_items (#232) --- bzl_library.bzl | 2 +- rules/native_binary.bzl | 2 +- rules/run_binary.bzl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bzl_library.bzl b/bzl_library.bzl index b66a30c..1b59440 100644 --- a/bzl_library.bzl +++ b/bzl_library.bzl @@ -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`; diff --git a/rules/native_binary.bzl b/rules/native_binary.bzl index 9f64df4..7d885a0 100644 --- a/rules/native_binary.bzl +++ b/rules/native_binary.bzl @@ -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, diff --git a/rules/run_binary.bzl b/rules/run_binary.bzl index 5c7fe68..10f1ab5 100644 --- a/rules/run_binary.bzl +++ b/rules/run_binary.bzl @@ -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), )