Remove deprecated iteration over depsets.

See bazelbuild/bazel#5816
pmuetschard · Jun 21, 2019 · ffb6a77 · ffb6a77
1 parent 2fd3214
commit ffb6a77
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/tools/build/rules/grpc.bzl b/tools/build/rules/grpc.bzl
@@ -16,7 +16,7 @@ def _gen_java_source_impl(ctx):
   # Use .jar since .srcjar makes protoc think output will be a directory
   srcdotjar = ctx.actions.declare_file(ctx.label.name + "-src.jar")
   protos = [f for dep in ctx.attr.srcs for f in dep.proto.direct_sources]
-  includes = [f for dep in ctx.attr.srcs for f in dep.proto.transitive_imports]
+  includes = [f for dep in ctx.attr.srcs for f in dep.proto.transitive_imports.to_list()]
 
   arguments = [
     "--plugin=protoc-gen-grpc-java=" + ctx.executable._plugin.path,
@@ -74,7 +74,7 @@ _gen_java_source = rule(
 
 def _gen_cc_source_impl(ctx):
   protos = [f for dep in ctx.attr.srcs for f in dep.proto.direct_sources]
-  includes = [f for dep in ctx.attr.srcs for f in dep.proto.transitive_imports]
+  includes = [f for dep in ctx.attr.srcs for f in dep.proto.transitive_imports.to_list()]
 
   proto_root = ""
   if ctx.label.workspace_root:

diff --git a/tools/build/third_party/perfetto/ipc.bzl b/tools/build/third_party/perfetto/ipc.bzl
@@ -19,7 +19,7 @@ def _path_ignoring_repository(f):
 
 def _gen_cc_impl(ctx):
   protos = [f for dep in ctx.attr.deps for f in dep.proto.direct_sources]
-  includes = [f for dep in ctx.attr.deps for f in dep.proto.transitive_imports]
+  includes = [f for dep in ctx.attr.deps for f in dep.proto.transitive_imports.to_list()]
   proto_root = ""
   if ctx.label.workspace_root:
     proto_root = "/" + ctx.label.workspace_root

diff --git a/tools/build/third_party/perfetto/protozero.bzl b/tools/build/third_party/perfetto/protozero.bzl
@@ -19,7 +19,7 @@ def _path_ignoring_repository(f):
 
 def _gen_cc_impl(ctx):
   protos = [f for dep in ctx.attr.deps for f in dep.proto.direct_sources]
-  includes = [f for dep in ctx.attr.deps for f in dep.proto.transitive_imports]
+  includes = [f for dep in ctx.attr.deps for f in dep.proto.transitive_imports.to_list()]
   proto_root = ""
   if ctx.label.workspace_root:
     proto_root = "/" + ctx.label.workspace_root