opendev/gerrit
Code Issues Proposed changes

Bazel: Fix lint warning flagged by buildifier

Browse Source 
This change is fixing confusing name warning: [1].

  ./org.eclipse.jgit.test/tests.bzl:12: confusing-name:
  Never use 'l', 'I', or 'O' as names (they're too easily confused
  with 'I', 'l', or '0').

[1] https://github.com/bazelbuild/buildtools/blob/master/WARNINGS.md#confusing-name

Change-Id: Ic7df48c37dac4c95c593ac2203300d50acc9eaad
This commit is contained in:
David Ostrovsky
2019-06-18 09:55:22 +02:00
parent b214d441d9
commit 831c1ade1d
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/bzl/javadoc.bzl
View File

@@ -17,8 +17,8 @@
def _impl(ctx):
zip_output = ctx.outputs.zip
transitive_jars = depset(transitive = [l.java.transitive_deps for l in ctx.attr.libs])
source_jars = depset(transitive = [l.java.source_jars for l in ctx.attr.libs])
transitive_jars = depset(transitive = [j.java.transitive_deps for j in ctx.attr.libs])
source_jars = depset(transitive = [j.java.source_jars for j in ctx.attr.libs])
transitive_jar_paths = [j.path for j in transitive_jars.to_list()]
dir = ctx.outputs.zip.path + ".dir"

4
tools/bzl/junit.bzl
View File

@@ -28,8 +28,8 @@ public class %s {}
_PREFIXES = ("org", "com", "edu")
def _SafeIndex(l, val):
for i, v in enumerate(l):
def _SafeIndex(j, val):
for i, v in enumerate(j):
if val == v:
return i
return -1

14
tools/bzl/pkg_war.bzl
View File

@@ -76,11 +76,11 @@ def _war_impl(ctx):
# Add lib
transitive_libs = []
for l in ctx.attr.libs:
if hasattr(l, "java"):
transitive_libs.append(l.java.transitive_runtime_deps)
elif hasattr(l, "files"):
transitive_libs.append(l.files)
for j in ctx.attr.libs:
if hasattr(j, "java"):
transitive_libs.append(j.java.transitive_runtime_deps)
elif hasattr(j, "files"):
transitive_libs.append(j.files)
transitive_lib_deps = depset(transitive = transitive_libs)
for dep in transitive_lib_deps.to_list():
@@ -89,8 +89,8 @@ def _war_impl(ctx):
# Add pgm lib
transitive_pgmlibs = []
for l in ctx.attr.pgmlibs:
transitive_pgmlibs.append(l.java.transitive_runtime_deps)
for j in ctx.attr.pgmlibs:
transitive_pgmlibs.append(j.java.transitive_runtime_deps)
transitive_pgmlib_deps = depset(transitive = transitive_pgmlibs)
for dep in transitive_pgmlib_deps.to_list():