Automated rollback of commit fed055b.

*** 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 acd1bbb.

*** Reason for rollback ***

TAP has detected 10 or more targets failed to build at bazelbuild@acd1bbb.

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

@@ -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"])

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.

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(

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(

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.

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(

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"],
 )

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(

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(

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(

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(

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"],

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",
 ])

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",
 ])

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",
 ])

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",
 ])

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",
 ])

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",
 ])

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",
 ])

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",
 ])

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",
 ])

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",
 ])

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",
 ])

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.

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

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"])

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"])

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__"],
 )

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__"],
 )

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__"],
 )

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__"],
 )

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(

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(

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(

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__"],
 )

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__"],
 )

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",
+        ),
     },
 )

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)

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)

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()