From c62c2a60faf9529b51f0b9d6151de3772e8d9264 Mon Sep 17 00:00:00 2001 From: Googler Date: Fri, 9 Aug 2019 01:36:04 -0700 Subject: [PATCH] Automated rollback of commit fed055bd9acc518379a6aa1d552338bfbff4d9a4. *** Reason for rollback *** Manually rolled back on behalf of: elenairina. Reason Given: Rolling forward after an automated rollback. I cannot reproduce the broken builds with my initial CL. *** Original change description *** Automated rollback of commit acd1bbb7a9260f5a40e580062c004d1b978b3311. *** Reason for rollback *** TAP has detected 10 or more targets failed to build at https://github.com/bazelbuild/bazel/commit/acd1bbb7a9260f5a40e580062c004d1b978b3311. TO ROLLFORWARD (without additional approval): Use[] To see all broken targets visit [] To prevent noise from flakes, TAP double-checked the following target fails to build: [] *** PiperOrigin-RevId: 262518294 --- src/java_tools/buildjar/BUILD | 2 + .../com/google/devtools/build/buildjar/BUILD | 2 + .../devtools/build/buildjar/genclass/BUILD | 2 + .../devtools/build/buildjar/jarhelper/BUILD | 2 + .../build/buildjar/javac/plugins/BUILD | 2 + .../build/buildjar/javac/statistics/BUILD | 2 + .../google/devtools/build/java/bazel/BUILD | 2 + .../google/devtools/build/java/turbine/BUILD | 2 + .../devtools/build/java/turbine/javac/BUILD | 2 + .../com/google/devtools/build/buildjar/BUILD | 2 + .../devtools/build/java/turbine/javac/BUILD | 2 + .../com/google/testing/junit/junit4/BUILD | 2 + .../com/google/testing/junit/runner/BUILD | 2 + .../testing/junit/runner/internal/BUILD | 2 + .../google/testing/junit/runner/junit4/BUILD | 2 + .../google/testing/junit/runner/model/BUILD | 2 + .../testing/junit/runner/sharding/BUILD | 2 + .../testing/junit/runner/sharding/api/BUILD | 2 + .../junit/runner/sharding/testing/BUILD | 2 + .../google/testing/junit/runner/util/BUILD | 2 + .../google/testing/junit/junit4/runner/BUILD | 2 + .../com/google/testing/junit/runner/BUILD | 2 + .../google/testing/junit/runner/testbed/BUILD | 2 + .../com/google/devtools/build/singlejar/BUILD | 2 + .../java/com/google/devtools/build/zip/BUILD | 2 + .../com/google/devtools/build/singlejar/BUILD | 2 + .../com/google/devtools/build/zip/BUILD | 2 + .../devtools/build/lib/includescanning/BUILD | 2 + .../google/devtools/build/lib/metrics/BUILD | 2 + .../google/devtools/build/lib/network/BUILD | 2 + .../devtools/build/lib/outputfilter/BUILD | 2 + .../build/lib/skyframe/serialization/BUILD | 2 + .../skyframe/serialization/autocodec/BUILD | 2 + .../skyframe/serialization/testutils/BUILD | 2 + .../google/devtools/build/lib/unsafe/BUILD | 2 + .../google/devtools/build/lib/unsafe/BUILD | 2 + .../skydoc/testdata/repo_rules_test/input.bzl | 8 +- src/test/starlark/testdata/and_or_not.sky | 2 +- src/test/starlark/testdata/equality.sky | 54 ++++++------ src/test/starlark/testdata/string_elems.sky | 10 +-- src/test/starlark/testdata/string_find.sky | 60 ++++++------- .../starlark/testdata/string_splitlines.sky | 32 +++---- .../testdata/string_test_characters.sky | 86 +++++++++---------- 43 files changed, 198 insertions(+), 126 deletions(-) diff --git a/src/java_tools/buildjar/BUILD b/src/java_tools/buildjar/BUILD index bd2b06ea5f6112..d1f14d6378051a 100644 --- a/src/java_tools/buildjar/BUILD +++ b/src/java_tools/buildjar/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_binary", "java_toolchain") + # Description: # JavaBuilder and java tools used by Bazel package(default_visibility = [":buildjar_package_group"]) diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD index 2abd4be4544179..969b7190bdc9b9 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_binary", "java_library") + # Description: # The Java library builders, which are used by Bazel to compile Java # source code. diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD index bd6e437f721883..a588ec85ff97a9 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_binary", "java_library") + package(default_visibility = ["//src/java_tools/buildjar:buildjar_package_group"]) filegroup( diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper/BUILD index 2947261fefeb52..a8a47867098c9e 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper/BUILD +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/jarhelper/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library") + package(default_visibility = ["//src/java_tools/buildjar:buildjar_package_group"]) filegroup( diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD index fa2e8a615461dd..eb500c1df3a514 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/plugins/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library") + # Description: # Plugins for the Java library builders, which are used by Bazel to # compile Java source code. diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/statistics/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/statistics/BUILD index 69d693ef4ffbe6..475f34412dd2e9 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/statistics/BUILD +++ b/src/java_tools/buildjar/java/com/google/devtools/build/buildjar/javac/statistics/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library") + package(default_visibility = ["//visibility:public"]) java_library( diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD index 0c796402c898fd..f1a86d4cf890d1 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD +++ b/src/java_tools/buildjar/java/com/google/devtools/build/java/bazel/BUILD @@ -3,6 +3,8 @@ # # This is not the source code for javac itself. +load("@rules_java//java:defs.bzl", "java_library") + package( default_visibility = ["//src/java_tools/buildjar:buildjar_package_group"], ) diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/BUILD index 54e5c1e8868e71..c408ad7c40fcea 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/BUILD +++ b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_binary") + package(default_visibility = ["//src/java_tools/buildjar:buildjar_package_group"]) java_binary( diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/BUILD b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/BUILD index 88cf3293bef3a5..8f17ecf8a5f3e6 100644 --- a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/BUILD +++ b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_binary", "java_library") + package(default_visibility = ["//src/java_tools/buildjar:buildjar_package_group"]) java_binary( diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/BUILD b/src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/BUILD index c680e4f12aaf3d..d8772a0672f7d5 100644 --- a/src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/BUILD +++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/buildjar/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_test") + package(default_visibility = ["//src/java_tools/buildjar:buildjar_package_group"]) filegroup( diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD index c1b917832d4c03..86112858b764de 100644 --- a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD +++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library", "java_test") + package(default_visibility = ["//src/java_tools/buildjar:buildjar_package_group"]) java_library( diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/junit4/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/junit4/BUILD index dcd479334bbf79..832644370e6e5d 100644 --- a/src/java_tools/junitrunner/java/com/google/testing/junit/junit4/BUILD +++ b/src/java_tools/junitrunner/java/com/google/testing/junit/junit4/BUILD @@ -1,6 +1,8 @@ # Description: # JUnit 4.x extensions +load("@rules_java//java:defs.bzl", "java_library") + package( default_testonly = 1, default_visibility = ["//visibility:public"], diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/BUILD index cb9dd224c927bf..1d8aec47eab486 100644 --- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/BUILD +++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_binary", "java_library") + package(default_visibility = [ "//src/java_tools/junitrunner:junitrunner_package_group", ]) diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/BUILD index ecbe811e466def..c77b989dfddefc 100644 --- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/BUILD +++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library") + package(default_visibility = [ "//src/java_tools/junitrunner:junitrunner_package_group", ]) diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD index 05c248c720dc0d..e500bbd364faab 100644 --- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD +++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library") + package(default_visibility = [ "//src/java_tools/junitrunner:junitrunner_package_group", ]) diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/model/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/model/BUILD index 8395b149239d38..22463d5dfe0a70 100644 --- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/model/BUILD +++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/model/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library") + package(default_visibility = [ "//src/java_tools/junitrunner:junitrunner_package_group", ]) diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/BUILD index 72e5687e3d756c..b5897460e80869 100644 --- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/BUILD +++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library") + package(default_visibility = [ "//src/java_tools/junitrunner:junitrunner_package_group", ]) diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/api/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/api/BUILD index 2fcd55a1b7d886..8d4e2c1221d2f5 100644 --- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/api/BUILD +++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/api/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library") + package(default_visibility = [ "//src/java_tools/junitrunner:junitrunner_package_group", ]) diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/testing/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/testing/BUILD index 4a17308e6dc74b..ec3c1a1b3c604a 100644 --- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/testing/BUILD +++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/testing/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library") + package(default_visibility = [ "//src/java_tools/junitrunner:junitrunner_package_group", ]) diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/util/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/util/BUILD index 4d2ae59c7b90c6..2f3aa16055bd31 100644 --- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/util/BUILD +++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/util/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library") + package(default_visibility = [ "//src/java_tools/junitrunner:junitrunner_package_group", ]) diff --git a/src/java_tools/junitrunner/javatests/com/google/testing/junit/junit4/runner/BUILD b/src/java_tools/junitrunner/javatests/com/google/testing/junit/junit4/runner/BUILD index d16775014e8915..daf4e0ef02231f 100644 --- a/src/java_tools/junitrunner/javatests/com/google/testing/junit/junit4/runner/BUILD +++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/junit4/runner/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_test") + package(default_visibility = [ "//src/java_tools/junitrunner:junitrunner_package_group", ]) diff --git a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/BUILD b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/BUILD index ee22122fef770b..3c3e48b19c3879 100644 --- a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/BUILD +++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_binary", "java_library", "java_test") + package(default_visibility = [ "//src/java_tools/junitrunner:junitrunner_package_group", ]) diff --git a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/BUILD b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/BUILD index d7182eb4c6e5c5..8cf96daf6d2720 100644 --- a/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/BUILD +++ b/src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library") + package(default_visibility = [ "//src/java_tools/junitrunner:junitrunner_package_group", ]) diff --git a/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD b/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD index 6e1257e36bd463..4d8e8dc4e65b03 100644 --- a/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD +++ b/src/java_tools/singlejar/java/com/google/devtools/build/singlejar/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_binary", "java_library") + # Description: # SingleJar combines multiple zip files and additional files # into a single zip file. diff --git a/src/java_tools/singlejar/java/com/google/devtools/build/zip/BUILD b/src/java_tools/singlejar/java/com/google/devtools/build/zip/BUILD index 4cadbdf110a464..8c393eee6e2a73 100644 --- a/src/java_tools/singlejar/java/com/google/devtools/build/zip/BUILD +++ b/src/java_tools/singlejar/java/com/google/devtools/build/zip/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library") + # Description: # Zip provides a library for reading and writing zip files, allowing more # advanced manipulation than the JDK equivalents by providing detailed zip diff --git a/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/BUILD b/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/BUILD index ce83ab01c57b35..367d3bc846d2a1 100644 --- a/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/BUILD +++ b/src/java_tools/singlejar/javatests/com/google/devtools/build/singlejar/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library", "java_test") + # Description: # Tests for SingleJar package(default_visibility = ["//src/java_tools/singlejar:singlejar_package_group"]) diff --git a/src/java_tools/singlejar/javatests/com/google/devtools/build/zip/BUILD b/src/java_tools/singlejar/javatests/com/google/devtools/build/zip/BUILD index 269df1d9ff0d25..318196340a4508 100644 --- a/src/java_tools/singlejar/javatests/com/google/devtools/build/zip/BUILD +++ b/src/java_tools/singlejar/javatests/com/google/devtools/build/zip/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library", "java_test") + # Description: # Tests for Zip package(default_visibility = ["//src/java_tools/singlejar:singlejar_package_group"]) diff --git a/src/main/java/com/google/devtools/build/lib/includescanning/BUILD b/src/main/java/com/google/devtools/build/lib/includescanning/BUILD index 0ee8f146f75be7..f1302e7d810513 100644 --- a/src/main/java/com/google/devtools/build/lib/includescanning/BUILD +++ b/src/main/java/com/google/devtools/build/lib/includescanning/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library") + package( default_visibility = ["//src:__subpackages__"], ) diff --git a/src/main/java/com/google/devtools/build/lib/metrics/BUILD b/src/main/java/com/google/devtools/build/lib/metrics/BUILD index a12f18f24df4a5..75696a04d055dc 100644 --- a/src/main/java/com/google/devtools/build/lib/metrics/BUILD +++ b/src/main/java/com/google/devtools/build/lib/metrics/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library") + package( default_visibility = ["//src:__subpackages__"], ) diff --git a/src/main/java/com/google/devtools/build/lib/network/BUILD b/src/main/java/com/google/devtools/build/lib/network/BUILD index 349014cf2d634d..53e47c87377355 100644 --- a/src/main/java/com/google/devtools/build/lib/network/BUILD +++ b/src/main/java/com/google/devtools/build/lib/network/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library") + package( default_visibility = ["//src:__subpackages__"], ) diff --git a/src/main/java/com/google/devtools/build/lib/outputfilter/BUILD b/src/main/java/com/google/devtools/build/lib/outputfilter/BUILD index 2b9449a7c53443..18d590af91d95f 100644 --- a/src/main/java/com/google/devtools/build/lib/outputfilter/BUILD +++ b/src/main/java/com/google/devtools/build/lib/outputfilter/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library") + package( default_visibility = ["//src:__subpackages__"], ) diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/BUILD b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/BUILD index ee7ea9ac2ddbdb..2788b2dde0b065 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/BUILD +++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library") + package(default_visibility = ["//src:__subpackages__"]) filegroup( diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec/BUILD b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec/BUILD index fa424ba16b129c..57e52500566de3 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec/BUILD +++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/autocodec/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library", "java_plugin") + package(default_visibility = ["//src:__subpackages__"]) filegroup( diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/BUILD b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/BUILD index c57f70010f0781..7f90019f5afe63 100644 --- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/BUILD +++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/testutils/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library") + package(default_visibility = ["//src:__subpackages__"]) filegroup( diff --git a/src/main/java/com/google/devtools/build/lib/unsafe/BUILD b/src/main/java/com/google/devtools/build/lib/unsafe/BUILD index 84feca8a35e2a8..5802d0745afc86 100644 --- a/src/main/java/com/google/devtools/build/lib/unsafe/BUILD +++ b/src/main/java/com/google/devtools/build/lib/unsafe/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_library") + package( default_visibility = ["//src:__subpackages__"], ) diff --git a/src/test/java/com/google/devtools/build/lib/unsafe/BUILD b/src/test/java/com/google/devtools/build/lib/unsafe/BUILD index 3220a80b2c92c5..62fad0a5552c23 100644 --- a/src/test/java/com/google/devtools/build/lib/unsafe/BUILD +++ b/src/test/java/com/google/devtools/build/lib/unsafe/BUILD @@ -1,3 +1,5 @@ +load("@rules_java//java:defs.bzl", "java_test") + package( default_visibility = ["//src:__subpackages__"], ) diff --git a/src/test/java/com/google/devtools/build/skydoc/testdata/repo_rules_test/input.bzl b/src/test/java/com/google/devtools/build/skydoc/testdata/repo_rules_test/input.bzl index bac2323b157b13..fdd157335dedbe 100644 --- a/src/test/java/com/google/devtools/build/skydoc/testdata/repo_rules_test/input.bzl +++ b/src/test/java/com/google/devtools/build/skydoc/testdata/repo_rules_test/input.bzl @@ -5,9 +5,9 @@ my_repo = repository_rule( implementation = _repo_rule_impl, doc = "Minimal example of a repository rule.", attrs = { - "useless" : attr.string( - doc = "This argument will be ingored. You don't have to specify it, but you may.", - default = "ignoreme", - ), + "useless": attr.string( + doc = "This argument will be ingored. You don't have to specify it, but you may.", + default = "ignoreme", + ), }, ) diff --git a/src/test/starlark/testdata/and_or_not.sky b/src/test/starlark/testdata/and_or_not.sky index 63e5e608511a08..f926ae9548790a 100644 --- a/src/test/starlark/testdata/and_or_not.sky +++ b/src/test/starlark/testdata/and_or_not.sky @@ -22,7 +22,7 @@ assert_eq(0 and fail("do not execute"), 0) assert_eq(not 1, False) assert_eq(not "", True) -assert_eq(not not 1, True) +assert_eq(not (not 1), True) assert_eq(not 0 + 0, True) assert_eq(not 2 - 1, False) diff --git a/src/test/starlark/testdata/equality.sky b/src/test/starlark/testdata/equality.sky index eac92d7cc2ab51..0303d0f7c0e58e 100644 --- a/src/test/starlark/testdata/equality.sky +++ b/src/test/starlark/testdata/equality.sky @@ -1,52 +1,52 @@ # == operator assert_eq(1 == 1, True) assert_eq(1 == 2, False) -assert_eq('hello' == 'hel' + 'lo', True) -assert_eq('hello' == 'bye', False) +assert_eq("hello" == "hel" + "lo", True) +assert_eq("hello" == "bye", False) assert_eq(None == None, True) assert_eq([1, 2] == [1, 2], True) assert_eq([1, 2] == [2, 1], False) -assert_eq({'a': 1, 'b': 2} == {'b': 2, 'a': 1}, True) -assert_eq({'a': 1, 'b': 2} == {'a': 1}, False) -assert_eq({'a': 1, 'b': 2} == {'a': 1, 'b': 2, 'c': 3}, False) -assert_eq({'a': 1, 'b': 2} == {'a': 1, 'b': 3}, False) +assert_eq({"a": 1, "b": 2} == {"b": 2, "a": 1}, True) +assert_eq({"a": 1, "b": 2} == {"a": 1}, False) +assert_eq({"a": 1, "b": 2} == {"a": 1, "b": 2, "c": 3}, False) +assert_eq({"a": 1, "b": 2} == {"a": 1, "b": 3}, False) # != operator assert_eq(1 != 1, False) assert_eq(1 != 2, True) -assert_eq('hello' != 'hel' + 'lo', False) -assert_eq('hello' != 'bye', True) +assert_eq("hello" != "hel" + "lo", False) +assert_eq("hello" != "bye", True) assert_eq([1, 2] != [1, 2], False) assert_eq([1, 2] != [2, 1], True) -assert_eq({'a': 1, 'b': 2} != {'b': 2, 'a': 1}, False) -assert_eq({'a': 1, 'b': 2} != {'a': 1}, True) -assert_eq({'a': 1, 'b': 2} != {'a': 1, 'b': 2, 'c': 3}, True) -assert_eq({'a': 1, 'b': 2} != {'a': 1, 'b': 3}, True); +assert_eq({"a": 1, "b": 2} != {"b": 2, "a": 1}, False) +assert_eq({"a": 1, "b": 2} != {"a": 1}, True) +assert_eq({"a": 1, "b": 2} != {"a": 1, "b": 2, "c": 3}, True) +assert_eq({"a": 1, "b": 2} != {"a": 1, "b": 3}, True) # equality precedence assert_eq(1 + 3 == 2 + 2, True) assert_eq(not 1 == 2, True) assert_eq(not 1 != 2, False) assert_eq(2 and 3 == 3 or 1, True) -assert_eq(2 or 3 == 3 and 1, 2); +assert_eq(2 or 3 == 3 and 1, 2) # < operator assert_eq(1 <= 1, True) assert_eq(1 < 1, False) -assert_eq('a' <= 'b', True) -assert_eq('c' < 'a', False); +assert_eq("a" <= "b", True) +assert_eq("c" < "a", False) # <= and < operators assert_eq(1 <= 1, True) assert_eq(1 < 1, False) -assert_eq('a' <= 'b', True) -assert_eq('c' < 'a', False); +assert_eq("a" <= "b", True) +assert_eq("c" < "a", False) # >= and > operators assert_eq(1 >= 1, True) assert_eq(1 > 1, False) -assert_eq('a' >= 'b', False) -assert_eq('c' > 'a', True); +assert_eq("a" >= "b", False) +assert_eq("c" > "a", True) # list/tuple comparison assert_eq([] < [1], True) @@ -55,15 +55,15 @@ assert_eq([1, 1] < [1, 2], True) assert_eq([1, 2] < [1, 2, 3], True) assert_eq([1, 2, 3] <= [1, 2, 3], True) -assert_eq(['a', 'b'] > ['a'], True) -assert_eq(['a', 'b'] >= ['a'], True) -assert_eq(['a', 'b'] < ['a'], False) -assert_eq(['a', 'b'] <= ['a'], False) +assert_eq(["a", "b"] > ["a"], True) +assert_eq(["a", "b"] >= ["a"], True) +assert_eq(["a", "b"] < ["a"], False) +assert_eq(["a", "b"] <= ["a"], False) -assert_eq(('a', 'b') > ('a', 'b'), False) -assert_eq(('a', 'b') >= ('a', 'b'), True) -assert_eq(('a', 'b') < ('a', 'b'), False) -assert_eq(('a', 'b') <= ('a', 'b'), True) +assert_eq(("a", "b") > ("a", "b"), False) +assert_eq(("a", "b") >= ("a", "b"), True) +assert_eq(("a", "b") < ("a", "b"), False) +assert_eq(("a", "b") <= ("a", "b"), True) assert_eq([[1, 1]] > [[1, 1], []], False) assert_eq([[1, 1]] < [[1, 1], []], True) diff --git a/src/test/starlark/testdata/string_elems.sky b/src/test/starlark/testdata/string_elems.sky index 3dbe7249953d0c..192d88bf93a3b3 100644 --- a/src/test/starlark/testdata/string_elems.sky +++ b/src/test/starlark/testdata/string_elems.sky @@ -4,10 +4,10 @@ assert_eq(list("abcd".elems()), ["a", "b", "c", "d"]) assert_eq(len("aaa".elems()), 3) def test_iter(): - i = 0 - for c in "abcd".elems(): - assert_eq(c, "abcd"[i]) - i += 1 - assert_eq(i, 4) + i = 0 + for c in "abcd".elems(): + assert_eq(c, "abcd"[i]) + i += 1 + assert_eq(i, 4) test_iter() diff --git a/src/test/starlark/testdata/string_find.sky b/src/test/starlark/testdata/string_find.sky index abe8adf45a7588..efc12ab5397b29 100644 --- a/src/test/starlark/testdata/string_find.sky +++ b/src/test/starlark/testdata/string_find.sky @@ -1,31 +1,31 @@ -assert_eq('banana'.find('na'), 2) -assert_eq('banana'.find('na', 3, 1), -1) -assert_eq('aaaa'.find('a', 1, 1), -1) -assert_eq('aaaa'.find('a', 1, 50), 1) -assert_eq('aaaa'.find('aaaaa'), -1) -assert_eq('abababa'.find('ab', 1), 2) -assert_eq('abababa'.find('ab', 0), 0) -assert_eq('abababa'.find('ab', -1), -1) -assert_eq('abababa'.find('ab', -2), -1) -assert_eq('abababa'.find('ab', -3), 4) -assert_eq('abababa'.find('ab', 0, 1), -1) -assert_eq('abababa'.find('ab', 0, 2), 0) -assert_eq('abababa'.find('ab', -1000), 0) -assert_eq('abababa'.find('ab', 1000), -1) -assert_eq(''.find('a', 1), -1) +assert_eq("banana".find("na"), 2) +assert_eq("banana".find("na", 3, 1), -1) +assert_eq("aaaa".find("a", 1, 1), -1) +assert_eq("aaaa".find("a", 1, 50), 1) +assert_eq("aaaa".find("aaaaa"), -1) +assert_eq("abababa".find("ab", 1), 2) +assert_eq("abababa".find("ab", 0), 0) +assert_eq("abababa".find("ab", -1), -1) +assert_eq("abababa".find("ab", -2), -1) +assert_eq("abababa".find("ab", -3), 4) +assert_eq("abababa".find("ab", 0, 1), -1) +assert_eq("abababa".find("ab", 0, 2), 0) +assert_eq("abababa".find("ab", -1000), 0) +assert_eq("abababa".find("ab", 1000), -1) +assert_eq("".find("a", 1), -1) -assert_eq('banana'.rfind('na'), 4) -assert_eq('banana'.rfind('na', 3, 1), -1) -assert_eq('aaaa'.rfind('a', 1, 1), -1) -assert_eq('aaaa'.rfind('a', 1, 50), 3) -assert_eq('aaaa'.rfind('aaaaa'), -1) -assert_eq('abababa'.rfind('ab', 1), 4) -assert_eq('abababa'.rfind('ab', 0), 4) -assert_eq('abababa'.rfind('ab', -1), -1) -assert_eq('abababa'.rfind('ab', -2), -1) -assert_eq('abababa'.rfind('ab', -3), 4) -assert_eq('abababa'.rfind('ab', 0, 1), -1) -assert_eq('abababa'.rfind('ab', 0, 2), 0) -assert_eq('abababa'.rfind('ab', -1000), 4) -assert_eq('abababa'.rfind('ab', 1000), -1) -assert_eq(''.rfind('a', 1), -1) +assert_eq("banana".rfind("na"), 4) +assert_eq("banana".rfind("na", 3, 1), -1) +assert_eq("aaaa".rfind("a", 1, 1), -1) +assert_eq("aaaa".rfind("a", 1, 50), 3) +assert_eq("aaaa".rfind("aaaaa"), -1) +assert_eq("abababa".rfind("ab", 1), 4) +assert_eq("abababa".rfind("ab", 0), 4) +assert_eq("abababa".rfind("ab", -1), -1) +assert_eq("abababa".rfind("ab", -2), -1) +assert_eq("abababa".rfind("ab", -3), 4) +assert_eq("abababa".rfind("ab", 0, 1), -1) +assert_eq("abababa".rfind("ab", 0, 2), 0) +assert_eq("abababa".rfind("ab", -1000), 4) +assert_eq("abababa".rfind("ab", 1000), -1) +assert_eq("".rfind("a", 1), -1) diff --git a/src/test/starlark/testdata/string_splitlines.sky b/src/test/starlark/testdata/string_splitlines.sky index 8590513f3af89b..ce6574d0fea13f 100644 --- a/src/test/starlark/testdata/string_splitlines.sky +++ b/src/test/starlark/testdata/string_splitlines.sky @@ -1,29 +1,29 @@ # Empty line -assert_eq(''.splitlines(), []) -assert_eq('\n'.splitlines(), ['']) +assert_eq("".splitlines(), []) +assert_eq("\n".splitlines(), [""]) # Starts with line break -assert_eq('\ntest'.splitlines(), ['', 'test']) +assert_eq("\ntest".splitlines(), ["", "test"]) # Ends with line break -assert_eq('test\n'.splitlines(), ['test']) +assert_eq("test\n".splitlines(), ["test"]) # Different line breaks -assert_eq('this\nis\na\ntest'.splitlines(), ['this', 'is', 'a', 'test']) +assert_eq("this\nis\na\ntest".splitlines(), ["this", "is", "a", "test"]) # Only line breaks -assert_eq('\n\n\n'.splitlines(), ['', '', '']) -assert_eq('\r\r\r'.splitlines(), ['', '', '']) -assert_eq('\n\r\n\r'.splitlines(), ['', '', '']) -assert_eq('\r\n\r\n\r\n'.splitlines(), ['', '', '']) +assert_eq("\n\n\n".splitlines(), ["", "", ""]) +assert_eq("\r\r\r".splitlines(), ["", "", ""]) +assert_eq("\n\r\n\r".splitlines(), ["", "", ""]) +assert_eq("\r\n\r\n\r\n".splitlines(), ["", "", ""]) # Escaped sequences -assert_eq('\n\\n\\\n'.splitlines(), ['', '\\n\\']) +assert_eq("\n\\n\\\n".splitlines(), ["", "\\n\\"]) # KeepEnds -assert_eq(''.splitlines(True), []) -assert_eq('\n'.splitlines(True), ['\n']) -assert_eq('this\nis\r\na\rtest'.splitlines(True), ['this\n', 'is\r\n', 'a\r', 'test']) -assert_eq('\ntest'.splitlines(True), ['\n', 'test']) -assert_eq('test\n'.splitlines(True), ['test\n']) -assert_eq('\n\\n\\\n'.splitlines(True), ['\n', '\\n\\\n']) +assert_eq("".splitlines(True), []) +assert_eq("\n".splitlines(True), ["\n"]) +assert_eq("this\nis\r\na\rtest".splitlines(True), ["this\n", "is\r\n", "a\r", "test"]) +assert_eq("\ntest".splitlines(True), ["\n", "test"]) +assert_eq("test\n".splitlines(True), ["test\n"]) +assert_eq("\n\\n\\\n".splitlines(True), ["\n", "\\n\\\n"]) diff --git a/src/test/starlark/testdata/string_test_characters.sky b/src/test/starlark/testdata/string_test_characters.sky index df81d375737cf1..e488e2fc8d609a 100644 --- a/src/test/starlark/testdata/string_test_characters.sky +++ b/src/test/starlark/testdata/string_test_characters.sky @@ -1,54 +1,54 @@ # isalnum -assert_eq(''.isalnum(), False) -assert_eq('a0 33'.isalnum(), False) -assert_eq('1'.isalnum(), True) -assert_eq('a033'.isalnum(), True) +assert_eq("".isalnum(), False) +assert_eq("a0 33".isalnum(), False) +assert_eq("1".isalnum(), True) +assert_eq("a033".isalnum(), True) # isdigit -assert_eq(''.isdigit(), False) -assert_eq(' '.isdigit(), False) -assert_eq('a'.isdigit(), False) -assert_eq('0234325.33'.isdigit(), False) -assert_eq('1'.isdigit(), True) -assert_eq('033'.isdigit(), True) +assert_eq("".isdigit(), False) +assert_eq(" ".isdigit(), False) +assert_eq("a".isdigit(), False) +assert_eq("0234325.33".isdigit(), False) +assert_eq("1".isdigit(), True) +assert_eq("033".isdigit(), True) # isspace -assert_eq(''.isspace(), False) -assert_eq('a'.isspace(), False) -assert_eq('1'.isspace(), False) -assert_eq('\ta\n'.isspace(), False) -assert_eq(' '.isspace(), True) -assert_eq('\t\n'.isspace(), True) +assert_eq("".isspace(), False) +assert_eq("a".isspace(), False) +assert_eq("1".isspace(), False) +assert_eq("\ta\n".isspace(), False) +assert_eq(" ".isspace(), True) +assert_eq("\t\n".isspace(), True) # islower -assert_eq(''.islower(), False) -assert_eq(' '.islower(), False) -assert_eq('1'.islower(), False) -assert_eq('Almost'.islower(), False) -assert_eq('abc'.islower(), True) -assert_eq(' \nabc'.islower(), True) -assert_eq('abc def\n'.islower(), True) -assert_eq('\ta\n'.islower(), True) +assert_eq("".islower(), False) +assert_eq(" ".islower(), False) +assert_eq("1".islower(), False) +assert_eq("Almost".islower(), False) +assert_eq("abc".islower(), True) +assert_eq(" \nabc".islower(), True) +assert_eq("abc def\n".islower(), True) +assert_eq("\ta\n".islower(), True) # isupper -assert_eq(''.isupper(), False) -assert_eq(' '.isupper(), False) -assert_eq('1'.isupper(), False) -assert_eq('aLMOST'.isupper(), False) -assert_eq('ABC'.isupper(), True) -assert_eq(' \nABC'.isupper(), True) -assert_eq('ABC DEF\n'.isupper(), True) -assert_eq('\tA\n'.isupper(), True) +assert_eq("".isupper(), False) +assert_eq(" ".isupper(), False) +assert_eq("1".isupper(), False) +assert_eq("aLMOST".isupper(), False) +assert_eq("ABC".isupper(), True) +assert_eq(" \nABC".isupper(), True) +assert_eq("ABC DEF\n".isupper(), True) +assert_eq("\tA\n".isupper(), True) # istitle -assert_eq(''.istitle(), False) -assert_eq(' '.istitle(), False) -assert_eq('134'.istitle(), False) -assert_eq('almost Correct'.istitle(), False) -assert_eq('1nope Nope Nope'.istitle(), False) -assert_eq('NO Way'.istitle(), False) -assert_eq('T'.istitle(), True) -assert_eq('Correct'.istitle(), True) -assert_eq('Very Correct! Yes\nIndeed1X'.istitle(), True) -assert_eq('1234Ab Ab'.istitle(), True) -assert_eq('\tA\n'.istitle(), True) +assert_eq("".istitle(), False) +assert_eq(" ".istitle(), False) +assert_eq("134".istitle(), False) +assert_eq("almost Correct".istitle(), False) +assert_eq("1nope Nope Nope".istitle(), False) +assert_eq("NO Way".istitle(), False) +assert_eq("T".istitle(), True) +assert_eq("Correct".istitle(), True) +assert_eq("Very Correct! Yes\nIndeed1X".istitle(), True) +assert_eq("1234Ab Ab".istitle(), True) +assert_eq("\tA\n".istitle(), True)