Skip to content
This repository has been archived by the owner on Jun 5, 2021. It is now read-only.

Removed all instances of direct iteration over a depset #59

Merged
merged 1 commit into from
Jun 6, 2019
Merged

Removed all instances of direct iteration over a depset #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions internal/js_library/rule.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def _js_library_create_full_src(ctx, internal_deps, npm_packages):
npm_packages[NpmPackagesInfo].installed_dir,
] + [
d[JsLibraryInfo].compiled_javascript_dir
for d in internal_deps
for d in internal_deps.to_list()
] + ctx.files.srcs,
outputs = [ctx.outputs.compiled_javascript_dir],
executable = ctx.file._internal_nodejs,
Expand All @@ -119,7 +119,7 @@ def _js_library_create_full_src(ctx, internal_deps, npm_packages):
("|".join([
(";".join(d[JsLibraryInfo].javascript_source_files)) + ":" +
d[JsLibraryInfo].compiled_javascript_dir.path
for d in internal_deps
for d in internal_deps.to_list()
])),
# List of source files, which will be processed ("import" statements
# automatically replaced) and copied into the new directory.
Expand All @@ -141,7 +141,7 @@ def _js_library_compile(ctx, internal_deps, npm_packages):
npm_packages[NpmPackagesInfo].installed_dir,
] + [
d[JsLibraryInfo].compiled_javascript_dir
for d in internal_deps
for d in internal_deps.to_list()
],
outputs = [ctx.outputs.compiled_dir],
executable = ctx.file._internal_nodejs,
Expand Down
8 changes: 4 additions & 4 deletions internal/ts_library/rule.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def _ts_library_create_full_src(ctx, internal_deps, npm_packages, output_dir, fo
ctx.file.tsconfig,
] + [
d[TsLibraryInfo].original_typescript_dir if for_compilation and TsLibraryInfo in d else d[JsLibraryInfo].compiled_javascript_dir
for d in internal_deps
for d in internal_deps.to_list()
] + ctx.files.srcs,
outputs = [output_dir],
executable = ctx.file._internal_nodejs,
Expand All @@ -158,7 +158,7 @@ def _ts_library_create_full_src(ctx, internal_deps, npm_packages, output_dir, fo
(
d[TsLibraryInfo].original_typescript_dir.path if for_compilation and TsLibraryInfo in d else d[JsLibraryInfo].compiled_javascript_dir.path
)
for d in internal_deps
for d in internal_deps.to_list()
])),
# List of source files, which will be processed ("import" statements
# automatically replaced) and copied into the new directory.
Expand All @@ -180,7 +180,7 @@ def _ts_library_compile(ctx, internal_deps, npm_packages):
npm_packages[NpmPackagesInfo].installed_dir,
] + [
d[TsLibraryInfo].original_typescript_dir if TsLibraryInfo in d else d[JsLibraryInfo].compiled_javascript_dir
for d in internal_deps
for d in internal_deps.to_list()
],
outputs = [ctx.outputs.compiled_dir],
executable = ctx.file._internal_nodejs,
Expand All @@ -207,7 +207,7 @@ def _ts_library_transpile(ctx, internal_deps, npm_packages):
npm_packages[NpmPackagesInfo].installed_dir,
] + [
d[JsLibraryInfo].compiled_javascript_dir
for d in internal_deps
for d in internal_deps.to_list()
],
outputs = [ctx.outputs.transpiled_dir],
executable = ctx.file._internal_nodejs,
Expand Down