Linter script (#1191)

bazelbuild · Jan 29, 2021 · 84d7473 · 84d7473
1 parent c05005c
commit 84d7473
Show file tree

Hide file tree

Showing 53 changed files with 80 additions and 114 deletions.
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -62,7 +62,7 @@ tasks:
     shell_commands:
     - ./test_version.sh
   examples_ubuntu2004:
-    name: "./test_examples.sh"
+    name: "bazel //tools:lint_check"
     platform: ubuntu2004
-    shell_commands:
-    - ./test_examples.sh
+    run_targets:
+    -  "//tools:lint_check"
diff --git a/WORKSPACE b/WORKSPACE
@@ -1,8 +1,6 @@
 workspace(name = "io_bazel_rules_scala")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
-load("@bazel_tools//tools/build_defs/repo:jvm.bzl", "jvm_maven_import_external")
 
 skylib_version = "1.0.3"
 
@@ -49,13 +47,11 @@ load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
 
 scala_config()
 
-load("@io_bazel_rules_scala_config//:config.bzl", "SCALA_MAJOR_VERSION")
 load("//scala:scala.bzl", "scala_repositories")
 
 scala_repositories(fetch_sources = True)
 
-load("//scala:scala_cross_version.bzl", "default_maven_server_urls", "scala_mvn_artifact")
-load("//scala:scala_maven_import_external.bzl", "scala_maven_import_external")
+load("//scala:scala_cross_version.bzl", "default_maven_server_urls")
 load("//twitter_scrooge:twitter_scrooge.bzl", "twitter_scrooge")
 
 twitter_scrooge()
@@ -115,14 +111,12 @@ scala_register_unused_deps_toolchains()
 
 register_toolchains("@io_bazel_rules_scala//test/proto:scalapb_toolchain")
 
-load("//scala:scala_maven_import_external.bzl", "java_import_external", "scala_maven_import_external")
+load("//scala:scala_maven_import_external.bzl", "java_import_external")
 
 # bazel's java_import_external has been altered in rules_scala to be a macro based on jvm_import_external
 # in order to allow for other jvm-language imports (e.g. scala_import)
 # the 3rd-party dependency below is using the java_import_external macro
 # in order to make sure no regression with the original java_import_external
-load("//scala:scala_maven_import_external.bzl", "java_import_external")
-
 java_import_external(
     name = "org_apache_commons_commons_lang_3_5_without_file",
     generated_linkable_rule_name = "linkable_org_apache_commons_commons_lang_3_5_without_file",

diff --git a/lint.sh b/lint.sh
@@ -2,4 +2,4 @@
 
 set -eou pipefail
 
-./tools/bazel run //tools:buildifier@fix
+bazel run //tools:lint_fix
diff --git a/manual_test/coverage_local_jacocorunner/BUILD b/manual_test/coverage_local_jacocorunner/BUILD
@@ -1,5 +1,4 @@
 load("//scala:scala_toolchain.bzl", "scala_toolchain")
-load("//scala:scala.bzl", "scala_test")
 
 scala_toolchain(
     name = "local_jacocorunner_toolchain_impl",

diff --git a/private/format.bzl b/private/format.bzl
@@ -17,7 +17,6 @@
 load(
     "@bazel_tools//tools/build_defs/repo:http.bzl",
     "http_archive",
-    "http_file",
 )
 load(
     "@bazel_tools//tools/build_defs/repo:java.bzl",

diff --git a/scala/private/common.bzl b/scala/private/common.bzl
@@ -109,7 +109,7 @@ def add_labels_of_jars_to(jars2labels, dependency, all_jars, direct_jars):
     for jar in all_jars:
         path = jar.path
         if path not in jars2labels:
-            # skylark exposes only labels of direct dependencies.
+            # starlark exposes only labels of direct dependencies.
             # to get labels of indirect dependencies we collect them from the providers transitively
             label = _provider_of_dependency_label_of(dependency, path)
             if label == None:

diff --git a/scala/private/phases/phase_compile.bzl b/scala/private/phases/phase_compile.bzl
@@ -15,7 +15,6 @@ load(
     "@io_bazel_rules_scala//scala/private:rule_impls.bzl",
     _compile_java = "compile_java",
     _compile_scala = "compile_scala",
-    _expand_location = "expand_location",
 )
 load(":resources.bzl", _resource_paths = "paths")
 
@@ -237,7 +236,7 @@ def _compile_or_empty(
 
         full_jars = [ctx.outputs.jar]
         if java_jar:
-            full_jars += [java_jar.jar]
+            full_jars.append(java_jar.jar)
 
         if java_jar:
             merged_provider = java_common.merge([scala_compilation_provider, java_jar.java_compilation_provider])
@@ -333,7 +332,7 @@ def _try_to_compile_java_jar(
     scala_sources_java_provider = _interim_java_provider_for_java_compilation(
         scala_output,
     )
-    providers_of_dependencies += [scala_sources_java_provider]
+    providers_of_dependencies.append(scala_sources_java_provider)
 
     full_java_jar = ctx.actions.declare_file(ctx.label.name + "_java.jar")
 

diff --git a/scala/private/phases/phase_write_executable.bzl b/scala/private/phases/phase_write_executable.bzl
@@ -11,10 +11,6 @@ load(
     "java_bin",
     "runfiles_root",
 )
-load(
-    "@io_bazel_rules_scala//scala/private:coverage_replacements_provider.bzl",
-    _coverage_replacements_provider = "coverage_replacements_provider",
-)
 
 def phase_write_executable_scalatest(ctx, p):
     # jvm_flags passed in on the target override scala_test_jvm_flags passed in on the

diff --git a/scala/private/resources.bzl b/scala/private/resources.bzl
@@ -1,5 +1,3 @@
-load("@bazel_skylib//lib:paths.bzl", _paths = "paths")
-
 def paths(resources, resource_strip_prefix):
     """Return a list of path tuples (target, source) where:
         target - is a path in the archive (with given prefix stripped off)

diff --git a/scala/private/rules/scala_library.bzl b/scala/private/rules/scala_library.bzl
@@ -22,7 +22,6 @@ load(
     "phase_collect_jars_common",
     "phase_collect_jars_macro_library",
     "phase_collect_srcjars",
-    "phase_compile_common",
     "phase_compile_library",
     "phase_compile_library_for_plugin_bootstrapping",
     "phase_compile_macro_library",

diff --git a/scala/private/toolchain_deps/toolchain_dep_rules.bzl b/scala/private/toolchain_deps/toolchain_dep_rules.bzl
@@ -1,7 +1,6 @@
 load(
     "//scala/private/toolchain_deps:toolchain_deps.bzl",
     "expose_toolchain_deps",
-    "java_info_for_deps",
 )
 
 _toolchain_type = "@io_bazel_rules_scala//scala:toolchain_type"

diff --git a/scala/scalafmt/BUILD b/scala/scalafmt/BUILD
@@ -1,6 +1,10 @@
 load("//scala:scala.bzl", "scala_binary")
 load("//scala/scalafmt/toolchain:toolchain.bzl", "export_scalafmt_deps", "scalafmt_toolchain")
 load("@io_bazel_rules_scala//scala:providers.bzl", "declare_deps_provider")
+load(
+    "//scala/scalafmt:phase_scalafmt_ext.bzl",
+    "scalafmt_singleton",
+)
 
 filegroup(
     name = "runner",
@@ -25,11 +29,6 @@ scala_binary(
     ],
 )
 
-load(
-    "//scala/scalafmt:phase_scalafmt_ext.bzl",
-    "scalafmt_singleton",
-)
-
 scalafmt_singleton(
     name = "phase_scalafmt",
     visibility = ["//visibility:public"],

diff --git a/scala/scalatest/BUILD b/scala/scalatest/BUILD
@@ -1,7 +1,5 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//scala:scala_import.bzl", "scala_import")
-
 alias(
     name = "scalatest",
     actual = "//testing/toolchain:scalatest_classpath",

diff --git a/scala_proto/BUILD b/scala_proto/BUILD
@@ -1,4 +1,3 @@
-load("@rules_java//java:defs.bzl", "java_library")
 load(
     "//scala_proto:scala_proto_toolchain.bzl",
     "export_scalapb_toolchain_deps",

diff --git a/scala_proto/private/proto_to_scala_src.bzl b/scala_proto/private/proto_to_scala_src.bzl
@@ -1,8 +1,3 @@
-load(
-    "//scala/private:common.bzl",
-    "write_manifest_file",
-)
-
 def _root_path(f):
     if f.is_source:
         return f.owner.workspace_root

diff --git a/scala_proto/private/scalapb_aspect.bzl b/scala_proto/private/scalapb_aspect.bzl
@@ -3,7 +3,7 @@ load("//scala/private:common.bzl", "write_manifest_file")
 load("//scala/private:dependency.bzl", "legacy_unclear_dependency_info_for_protobuf_scrooge")
 load("//scala/private:rule_impls.bzl", "compile_scala")
 load("//scala_proto/private:proto_to_scala_src.bzl", "proto_to_scala_src")
-load("//scala/private/toolchain_deps:toolchain_deps.bzl", "find_deps_info_on", "java_info_for_deps")
+load("//scala/private/toolchain_deps:toolchain_deps.bzl", "find_deps_info_on")
 
 ScalaPBAspectInfo = provider(fields = [
     "proto_info",

diff --git a/scala_proto/scala_proto.bzl b/scala_proto/scala_proto.bzl
@@ -1,7 +1,3 @@
-load(
-    "@rules_proto//proto:defs.bzl",
-    "ProtoInfo",
-)
 load(
     "//scala:scala_cross_version.bzl",
     _default_maven_server_urls = "default_maven_server_urls",

diff --git a/scala_proto/scala_proto_toolchain.bzl b/scala_proto/scala_proto_toolchain.bzl
@@ -1,4 +1,3 @@
-load("//scala_proto:default_dep_sets.bzl", "DEFAULT_SCALAPB_COMPILE_DEPS", "DEFAULT_SCALAPB_GRPC_DEPS")
 load("@io_bazel_rules_scala//scala:providers.bzl", "DepsInfo")
 load("//scala/private/toolchain_deps:toolchain_deps.bzl", "expose_toolchain_deps")
 

diff --git a/specs2/specs2_junit.bzl b/specs2/specs2_junit.bzl
@@ -2,7 +2,6 @@ load(
     "//specs2:specs2.bzl",
     "specs2_dependencies",
     "specs2_repositories",
-    "specs2_version",
 )
 load("//testing:junit.bzl", "junit_repositories")
 load(

diff --git a/src/java/io/bazel/rulesscala/specs2/BUILD b/src/java/io/bazel/rulesscala/specs2/BUILD
@@ -1,5 +1,4 @@
 load("//scala:scala.bzl", "scala_library")
-load("//specs2:specs2_junit.bzl", "specs2_junit_dependencies", "specs2_junit_repositories")
 
 scala_library(
     name = "specs2_test_discovery",

diff --git a/src/java/io/bazel/rulesscala/worker/BUILD b/src/java/io/bazel/rulesscala/worker/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_library", "java_test")
+
 java_library(
     name = "worker",
     srcs = ["Worker.java"],

diff --git a/src/protobuf/io/bazel/rules_scala/BUILD b/src/protobuf/io/bazel/rules_scala/BUILD
@@ -1,3 +1,6 @@
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_java//java:defs.bzl", "java_proto_library")
+
 proto_library(
     name = "diagnostics_proto",
     srcs = ["diagnostics.proto"],

diff --git a/test/BUILD b/test/BUILD
@@ -1,8 +1,5 @@
 load("@rules_python//python:defs.bzl", "py_binary")
 load("@rules_java//java:defs.bzl", "java_binary", "java_import", "java_library")
-
-package(default_testonly = 1)
-
 load(
     "//scala:scala.bzl",
     "scala_binary",
@@ -20,6 +17,9 @@ load(
     "//scala_proto:scala_proto.bzl",
     "scala_proto_library",
 )
+load(":check_statsfile.bzl", "check_statsfile")
+
+package(default_testonly = 1)
 
 # The examples below show how to combine Scala and Java rules.
 # ScalaBinary is the Scala equivalent of JavaBinary.
@@ -114,7 +114,7 @@ scala_test_suite(
 scala_test_suite(
     name = "TestSuitePassesKwArgs",
     size = "small",  # Not a macro, can pass test-specific attributes.
-    srcs = glob(["ScalaTestData.scala"]),
+    srcs = ["ScalaTestData.scala"],
     data = ["//test/data:foo.txt"],
     jvm_flags = ["-Dtext=$(location //test/data:foo.txt)"],
     scalac_jvm_flags = [
@@ -687,8 +687,6 @@ scala_library(
     srcs = ["JavaUsesScalaStdLib.java"],
 )
 
-load(":check_statsfile.bzl", "check_statsfile")
-
 check_statsfile("ScalaBinary")
 
 check_statsfile("ScalaLibBinary")

diff --git a/test/aspect/aspect.bzl b/test/aspect/aspect.bzl
@@ -66,7 +66,7 @@ def _rule_impl(ctx):
         output = ctx.outputs.executable,
         content = content,
     )
-    return struct()
+    return []
 
 aspect_test = rule(
     implementation = _rule_impl,

diff --git a/test/coverage/BUILD b/test/coverage/BUILD
@@ -1,6 +1,5 @@
 load("@rules_java//java:defs.bzl", "java_library", "java_test")
 load("//scala:scala.bzl", "scala_library", "scala_test")
-load("//scala:scala_toolchain.bzl", "scala_toolchain")
 
 scala_test(
     name = "test-all",

diff --git a/test/diagnostics_reporter/BUILD b/test/diagnostics_reporter/BUILD
@@ -1,3 +1,5 @@
+load("@rules_java//java:defs.bzl", "java_binary")
+
 java_binary(
     name = "diagnostics_reporter_test",
     srcs = [

diff --git a/test/gen_src/BUILD b/test/gen_src/BUILD
@@ -1,7 +1,6 @@
 load(
     "//scala:scala.bzl",
     "scala_binary",
-    "scala_library",
 )
 
 scala_binary(

diff --git a/test/proto/BUILD b/test/proto/BUILD
@@ -7,7 +7,6 @@ load(
 load(
     "//scala:scala.bzl",
     "scala_binary",
-    "scala_library",
     "scala_test",
 )
 load(

diff --git a/test/src/main/scala/scalarules/test/ijar/BUILD b/test/src/main/scala/scalarules/test/ijar/BUILD
@@ -1,6 +1,6 @@
-package(default_visibility = ["//visibility:public"])
+load("//scala:scala.bzl", "scala_library")
 
-load("//scala:scala.bzl", "scala_binary", "scala_library", "scala_test")
+package(default_visibility = ["//visibility:public"])
 
 scala_library(
     name = "user",

diff --git a/test/src/main/scala/scalarules/test/io_utils/BUILD b/test/src/main/scala/scalarules/test/io_utils/BUILD
@@ -1,4 +1,4 @@
-load("//scala:scala.bzl", "scala_library", "scala_test")
+load("//scala:scala.bzl", "scala_test")
 
 scala_test(
     name = "directory_utils",

diff --git a/test/src/main/scala/scalarules/test/resource_jars/BUILD b/test/src/main/scala/scalarules/test/resource_jars/BUILD
@@ -1,4 +1,4 @@
-load("//scala:scala.bzl", "scala_library", "scala_test")
+load("//scala:scala.bzl", "scala_test")
 
 scala_test(
     name = "resource_jars",

diff --git a/test/src/main/scala/scalarules/test/scripts/BUILD b/test/src/main/scala/scalarules/test/scripts/BUILD
@@ -1,5 +1,4 @@
-load("//scala:scala.bzl", "scala_library", "scala_specs2_junit_test")
-load("//scala:scala_import.bzl", "scala_import")
+load("//scala:scala.bzl", "scala_specs2_junit_test")
 
 scala_specs2_junit_test(
     name = "pb_generate_request_test",

diff --git a/test/src/main/scala/scalarules/test/strict_deps/no_recompilation/BUILD b/test/src/main/scala/scalarules/test/strict_deps/no_recompilation/BUILD
@@ -1,6 +1,6 @@
-package(default_visibility = ["//visibility:public"])
+load("//scala:scala.bzl", "scala_library")
 
-load("//scala:scala.bzl", "scala_binary", "scala_library", "scala_test")
+package(default_visibility = ["//visibility:public"])
 
 scala_library(
     name = "transitive_dependency_user",

diff --git a/test/src/main/scala/scalarules/test/twitter_scrooge/BUILD b/test/src/main/scala/scalarules/test/twitter_scrooge/BUILD
@@ -1,6 +1,6 @@
+load("@rules_java//java:defs.bzl", "java_binary")
 load("//scala:scala.bzl", "scala_binary", "scala_library")
 load("//twitter_scrooge:twitter_scrooge.bzl", "scrooge_java_library", "scrooge_scala_library")
-load("//thrift:thrift.bzl", "thrift_library")
 load("//test/src/main/scala/scalarules/test/twitter_scrooge:twitter_scrooge_test.bzl", "twitter_scrooge_test_suite")
 
 scrooge_scala_library(

diff --git a/test/src/main/scala/scalarules/test/twitter_scrooge/twitter_scrooge_test.bzl b/test/src/main/scala/scalarules/test/twitter_scrooge/twitter_scrooge_test.bzl
@@ -1,7 +1,5 @@
 load("@bazel_skylib//lib:unittest.bzl", "asserts", "unittest")
 load("@bazel_skylib//lib:collections.bzl", "collections")
-load("//twitter_scrooge:twitter_scrooge.bzl", "scrooge_scala_library")
-load("//thrift:thrift.bzl", "thrift_library")
 
 def _scrooge_transitive_outputs(ctx):
     env = unittest.begin(ctx)

diff --git a/test_expect_failure/disappearing_class/BUILD b/test_expect_failure/disappearing_class/BUILD
@@ -1,4 +1,4 @@
-load("//scala:scala.bzl", "scala_binary", "scala_library", "scala_macro_library", "scala_test")
+load("//scala:scala.bzl", "scala_library")
 
 scala_library(
     name = "uses_class",

diff --git a/test_expect_failure/missing_direct_deps/external_deps/BUILD b/test_expect_failure/missing_direct_deps/external_deps/BUILD
@@ -1,6 +1,6 @@
-package(default_visibility = ["//visibility:public"])
+load("//scala:scala.bzl", "scala_library")
 
-load("//scala:scala.bzl", "scala_library", "scala_test")
+package(default_visibility = ["//visibility:public"])
 
 scala_library(
     name = "transitive_external_dependency_user",

diff --git a/test_expect_failure/missing_direct_deps/internal_deps/BUILD b/test_expect_failure/missing_direct_deps/internal_deps/BUILD
@@ -1,10 +1,9 @@
 load("@rules_java//java:defs.bzl", "java_library")
+load("//scala:scala.bzl", "scala_binary", "scala_library")
+load(":custom-jvm-rule.bzl", "custom_jvm")
 
 package(default_visibility = ["//visibility:public"])
 
-load("//scala:scala.bzl", "scala_binary", "scala_library", "scala_test")
-load(":custom-jvm-rule.bzl", "custom_jvm")
-
 scala_library(
     name = "transitive_dependency_user",
     srcs = [

diff --git a/test_expect_failure/scalac_jvm_opts/BUILD b/test_expect_failure/scalac_jvm_opts/BUILD
@@ -1,9 +1,5 @@
 load("//scala:scala_toolchain.bzl", "scala_toolchain")
 load("//scala:scala.bzl", "scala_library")
-load(
-    "//scala_proto:scala_proto.bzl",
-    "scala_proto_library",
-)
 
 scala_toolchain(
     name = "failing_toolchain_impl",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		set -eou pipefail

		./tools/bazel run //tools:buildifier@fix
		bazel run //tools:lint_fix