Remove Label wrappers for target string literals

jmh/jmh.bzl

@@ -39,12 +39,12 @@ scala_generate_benchmark = rule(
         "_generator": attr.label(
             executable = True,
             cfg = "exec",
-            default = Label(
-                "//src/scala/io/bazel/rules_scala/jmh_support:benchmark_generator",
+            default = (
+                "//src/scala/io/bazel/rules_scala/jmh_support:benchmark_generator"
             ),
         ),
         "runtime_jdk": attr.label(
-            default = Label("@rules_java//toolchains:current_java_runtime"),
+            default = "@rules_java//toolchains:current_java_runtime",
             providers = [java_common.JavaRuntimeInfo],
         ),
     },

jmh/toolchain/toolchain.bzl

@@ -39,7 +39,7 @@ jmh_toolchain = rule(
     },
 )
 
-_toolchain_type = Label("//jmh/toolchain:jmh_toolchain_type")
+_toolchain_type = "//jmh/toolchain:jmh_toolchain_type"
 
 def _export_toolchain_deps_impl(ctx):
     return expose_toolchain_deps(ctx, _toolchain_type)
@@ -64,7 +64,7 @@ def setup_jmh_toolchain(name):
     native.toolchain(
         name = name,
         toolchain = ":%s_impl" % name,
-        toolchain_type = _toolchain_type,
+        toolchain_type = Label(_toolchain_type),
         visibility = ["//visibility:public"],
     )
 

scala/plusone.bzl

@@ -10,7 +10,7 @@ PlusOneDeps = provider(
 )
 
 def _collect_plus_one_deps_aspect_impl(target, ctx):
-    toolchain = ctx.toolchains[Label("//scala:toolchain_type")]
+    toolchain = ctx.toolchains["//scala:toolchain_type"]
     if toolchain.dependency_mode != "plus-one":
         return []
 
@@ -26,5 +26,5 @@ def _collect_plus_one_deps_aspect_impl(target, ctx):
 collect_plus_one_deps_aspect = aspect(
     implementation = _collect_plus_one_deps_aspect_impl,
     attr_aspects = ["deps", "exports"],
-    toolchains = [Label("//scala:toolchain_type")],
+    toolchains = ["//scala:toolchain_type"],
 )

scala/private/common_attributes.bzl

@@ -29,7 +29,7 @@ common_attrs_for_plugin_bootstrapping = {
     "resource_strip_prefix": attr.string(),
     "resource_jars": attr.label_list(allow_files = True),
     "java_compile_toolchain": attr.label(
-        default = Label("@rules_java//toolchains:current_java_toolchain"),
+        default = "@rules_java//toolchains:current_java_toolchain",
         providers = [java_common.JavaToolchainInfo],
     ),
     "scalacopts": attr.string_list(),
@@ -56,8 +56,8 @@ common_attrs.update(common_attrs_for_plugin_bootstrapping)
 
 common_attrs.update({
     "_dependency_analyzer_plugin": attr.label(
-        default = Label(
-            "//third_party/dependency_analyzer/src/main:dependency_analyzer",
+        default = (
+            "//third_party/dependency_analyzer/src/main:dependency_analyzer"
         ),
         allow_files = [".jar"],
         mandatory = False,
@@ -73,9 +73,7 @@ common_attrs.update({
     ),
     "unused_dependency_checker_ignored_targets": attr.label_list(default = []),
     "_code_coverage_instrumentation_worker": attr.label(
-        default = Label(
-            "//src/java/io/bazel/rulesscala/coverage/instrumenter",
-        ),
+        default = "//src/java/io/bazel/rulesscala/coverage/instrumenter",
         allow_files = True,
         executable = True,
         cfg = "exec",
@@ -84,35 +82,35 @@ common_attrs.update({
 
 implicit_deps = {
     "_java_runtime": attr.label(
-        default = Label("@rules_java//toolchains:current_java_runtime"),
+        default = "@rules_java//toolchains:current_java_runtime",
     ),
     "_java_host_runtime": attr.label(
-        default = Label("@rules_java//toolchains:current_host_java_runtime"),
+        default = "@rules_java//toolchains:current_host_java_runtime",
     ),
     "_scalac": attr.label(
         executable = True,
         cfg = "exec",
-        default = Label("//src/java/io/bazel/rulesscala/scalac"),
+        default = "//src/java/io/bazel/rulesscala/scalac",
         allow_files = True,
     ),
     "_exe": attr.label(
         executable = True,
         cfg = "exec",
-        default = Label("//src/java/io/bazel/rulesscala/exe:exe"),
+        default = "//src/java/io/bazel/rulesscala/exe:exe",
     ),
 }
 
 launcher_template = {
     "_java_stub_template": attr.label(
-        default = Label("//java_stub_template/file"),
+        default = "//java_stub_template/file",
     ),
 }
 
 # Single dep to allow IDEs to pickup all the implicit dependencies.
 resolve_deps = {
     "_scala_toolchain": attr.label_list(
         default = [
-            Label("//scala/private/toolchain_deps:scala_library_classpath"),
+            "//scala/private/toolchain_deps:scala_library_classpath",
         ],
         allow_files = False,
     ),

scala/private/coverage_replacements_provider.bzl

@@ -67,7 +67,7 @@ def _aspect_impl(target, ctx):
 _aspect = aspect(
     attr_aspects = _dependency_attributes,
     implementation = _aspect_impl,
-    toolchains = [Label("//scala:toolchain_type")],
+    toolchains = ["//scala:toolchain_type"],
 )
 
 coverage_replacements_provider = struct(

scala/private/dependency.bzl

@@ -43,13 +43,13 @@ def get_strict_deps_mode(ctx):
     if not hasattr(ctx.attr, "_dependency_analyzer_plugin"):
         return "off"
 
-    return ctx.toolchains[Label("//scala:toolchain_type")].strict_deps_mode
+    return ctx.toolchains["//scala:toolchain_type"].strict_deps_mode
 
 def get_compiler_deps_mode(ctx):
     if not hasattr(ctx.attr, "_dependency_analyzer_plugin"):
         return "off"
 
-    return ctx.toolchains[Label("//scala:toolchain_type")].compiler_deps_mode
+    return ctx.toolchains["//scala:toolchain_type"].compiler_deps_mode
 
 def _is_strict_deps_on(ctx):
     return get_strict_deps_mode(ctx) != "off"

scala/private/phases/phase_compile.bzl

@@ -91,7 +91,7 @@ def phase_compile_common(ctx, p):
     return _phase_compile_default(ctx, p)
 
 def _phase_compile_default(ctx, p, _args = struct()):
-    toolchain = ctx.toolchains[Label("//scala:toolchain_type")]
+    toolchain = ctx.toolchains["//scala:toolchain_type"]
     buildijar_default_value = toolchain.scala_version.startswith("2.")
 
     return _phase_compile(

scala/private/phases/phase_coverage_runfiles.bzl

@@ -21,7 +21,7 @@ def phase_coverage_runfiles(ctx, p):
             coverage_replacements[jar] if jar in coverage_replacements else jar
             for jar in rjars.to_list()
         ])
-        jacocorunner = ctx.toolchains[Label("//scala:toolchain_type")].jacocorunner
+        jacocorunner = ctx.toolchains["//scala:toolchain_type"].jacocorunner
         coverage_runfiles = jacocorunner.files.to_list() + ctx.files._lcov_merger + coverage_replacements.values()
     return struct(
         coverage_runfiles = coverage_runfiles,

scala/private/phases/phase_dependency.bzl

@@ -35,7 +35,7 @@ def _phase_dependency(
         p,
         unused_deps_always_off,
         strict_deps_always_off):
-    toolchain = ctx.toolchains[Label("//scala:toolchain_type")]
+    toolchain = ctx.toolchains["//scala:toolchain_type"]
 
     target_label = str(ctx.label)
 
@@ -81,7 +81,7 @@ def _get_unused_deps_mode(ctx):
     if ctx.attr.unused_dependency_checker_mode:
         return ctx.attr.unused_dependency_checker_mode
     else:
-        return ctx.toolchains[Label("//scala:toolchain_type")].unused_dependency_checker_mode
+        return ctx.toolchains["//scala:toolchain_type"].unused_dependency_checker_mode
 
 def _is_target_included(target, includes, excludes):
     for exclude in excludes:

scala/private/phases/phase_scalac_provider.bzl

@@ -7,7 +7,7 @@ load("//scala/private/toolchain_deps:toolchain_deps.bzl", "find_deps_info_on")
 load("//scala:providers.bzl", _ScalacProvider = "ScalacProvider")
 
 def phase_scalac_provider(ctx, p):
-    toolchain_type_label = Label("//scala:toolchain_type")
+    toolchain_type_label = "//scala:toolchain_type"
 
     library_classpath = find_deps_info_on(ctx, toolchain_type_label, "scala_library_classpath").deps
     compile_classpath = find_deps_info_on(ctx, toolchain_type_label, "scala_compile_classpath").deps

scala/private/phases/phase_scalacopts.bzl

@@ -1,3 +1,3 @@
 def phase_scalacopts(ctx, p):
-    toolchain = ctx.toolchains[Label("//scala:toolchain_type")]
+    toolchain = ctx.toolchains["//scala:toolchain_type"]
     return toolchain.scalacopts + ctx.attr.scalacopts

scala/private/phases/phase_semanticdb.bzl

@@ -9,7 +9,7 @@ def phase_semanticdb(ctx, p):
 
     #Scala3: Semanticdb is built into scalac. Currently, if semanticdb-target is used, the semanticdb files are written and not bundled, otherwise, the semanticdb files are not written as files and only available inside the jar.
 
-    toolchain_type_label = Label("//scala:toolchain_type")
+    toolchain_type_label = "//scala:toolchain_type"
     toolchain = ctx.toolchains[toolchain_type_label]
 
     if toolchain.enable_semanticdb == True:

scala/private/phases/phase_write_executable.bzl

@@ -20,7 +20,7 @@ def phase_write_executable_scalatest(ctx, p):
     # toolchain
     final_jvm_flags = first_non_empty(
         ctx.attr.jvm_flags,
-        ctx.toolchains[Label("//scala:toolchain_type")].scala_test_jvm_flags,
+        ctx.toolchains["//scala:toolchain_type"].scala_test_jvm_flags,
     )
 
     args = struct(
@@ -115,7 +115,7 @@ def _write_executable_non_windows(ctx, executable, rjars, main_class, jvm_flags,
         wrapper.short_path,
     )
 
-    scala_toolchain = ctx.toolchains[Label("//scala:toolchain_type")]
+    scala_toolchain = ctx.toolchains["//scala:toolchain_type"]
 
     test_runner_classpath_mode = "argsfile" if scala_toolchain.use_argument_file_in_runner else "manifest"
 

scala/private/rule_impls.bzl

@@ -64,7 +64,7 @@ def compile_scala(
     if dependency_info.use_analyzer:
         plugins = depset(transitive = [plugins, ctx.attr._dependency_analyzer_plugin.files])
 
-    toolchain = ctx.toolchains[Label("//scala:toolchain_type")]
+    toolchain = ctx.toolchains["//scala:toolchain_type"]
     compiler_classpath_jars = cjars if dependency_info.dependency_mode == "direct" else transitive_compile_jars
     classpath_resources = getattr(ctx.files, "classpath_resources", [])
     scalacopts_expanded = [ctx.expand_location(v, input_plugins) for v in scalacopts]

scala/private/rules/scala_binary.bzl

@@ -60,7 +60,7 @@ _scala_binary_attrs = {
     "classpath_resources": attr.label_list(allow_files = True),
     "jvm_flags": attr.string_list(),
     "runtime_jdk": attr.label(
-        default = Label("@rules_java//toolchains:current_java_runtime"),
+        default = "@rules_java//toolchains:current_java_runtime",
         providers = [java_common.JavaRuntimeInfo],
     ),
 }
@@ -89,7 +89,7 @@ def make_scala_binary(*extras):
             *[extra["outputs"] for extra in extras if "outputs" in extra]
         ),
         toolchains = [
-            Label("//scala:toolchain_type"),
+            "//scala:toolchain_type",
             "@bazel_tools//tools/jdk:toolchain_type",
         ],
         cfg = scala_version_transition,

scala/private/rules/scala_doc.bzl

@@ -126,7 +126,7 @@ def make_scala_doc_rule(aspect = _scaladoc_transitive_aspect):
             "_scaladoc": attr.label(
                 cfg = "exec",
                 executable = True,
-                default = Label("//src/scala/io/bazel/rules_scala/scaladoc_support:scaladoc_generator"),
+                default = "//src/scala/io/bazel/rules_scala/scaladoc_support:scaladoc_generator",
             ),
         },
         doc = "Generate Scaladoc HTML documentation for source files in from the given dependencies.",

scala/private/rules/scala_junit_test.bzl

@@ -68,8 +68,8 @@ _scala_junit_test_attrs = {
     "prefixes": attr.string_list(default = []),
     "suffixes": attr.string_list(default = []),
     "suite_label": attr.label(
-        default = Label(
-            "//src/java/io/bazel/rulesscala/test_discovery:test_discovery",
+        default = (
+            "//src/java/io/bazel/rulesscala/test_discovery:test_discovery"
         ),
     ),
     "suite_class": attr.string(
@@ -81,30 +81,30 @@ _scala_junit_test_attrs = {
     ),
     "jvm_flags": attr.string_list(),
     "runtime_jdk": attr.label(
-        default = Label("@rules_java//toolchains:current_java_runtime"),
+        default = "@rules_java//toolchains:current_java_runtime",
         providers = [java_common.JavaRuntimeInfo],
     ),
     "env": attr.string_dict(default = {}),
     "env_inherit": attr.string_list(),
     "_junit_classpath": attr.label(
-        default = Label("//testing/toolchain:junit_classpath"),
+        default = "//testing/toolchain:junit_classpath",
     ),
     "_bazel_test_runner": attr.label(
-        default = Label("//scala:bazel_test_runner_deploy"),
+        default = "//scala:bazel_test_runner_deploy",
         allow_files = True,
     ),
     "_lcov_merger": attr.label(
-        default = Label(
-            "@bazel_tools//tools/test/CoverageOutputGenerator/java/com/google/devtools/coverageoutputgenerator:Main",
+        default = (
+            "@bazel_tools//tools/test/CoverageOutputGenerator/java/com/google/devtools/coverageoutputgenerator:Main"
         ),
     ),
 }
 
 _junit_resolve_deps = {
     "_scala_toolchain": attr.label_list(
         default = [
-            Label("//scala/private/toolchain_deps:scala_library_classpath"),
-            Label("//testing/toolchain:junit_classpath"),
+            "//scala/private/toolchain_deps:scala_library_classpath",
+            "//testing/toolchain:junit_classpath",
         ],
         allow_files = False,
     ),
@@ -138,8 +138,8 @@ def make_scala_junit_test(*extras):
         ),
         test = True,
         toolchains = [
-            Label("//scala:toolchain_type"),
-            Label("//testing/toolchain:testing_toolchain_type"),
+            "//scala:toolchain_type",
+            "//testing/toolchain:testing_toolchain_type",
             "@bazel_tools//tools/jdk:toolchain_type",
         ],
         cfg = scala_version_transition,

scala/private/rules/scala_library.bzl

@@ -105,7 +105,7 @@ def make_scala_library(*extras):
             *[extra["outputs"] for extra in extras if "outputs" in extra]
         ),
         toolchains = [
-            Label("//scala:toolchain_type"),
+            "//scala:toolchain_type",
             "@bazel_tools//tools/jdk:toolchain_type",
         ],
         cfg = scala_version_transition,
@@ -179,9 +179,7 @@ _scala_library_for_plugin_bootstrapping_attrs.update({
     "_scalac": attr.label(
         executable = True,
         cfg = "exec",
-        default = Label(
-            "//src/java/io/bazel/rulesscala/scalac:scalac_bootstrap",
-        ),
+        default = "//src/java/io/bazel/rulesscala/scalac:scalac_bootstrap",
         allow_files = True,
     ),
 })
@@ -209,7 +207,7 @@ def make_scala_library_for_plugin_bootstrapping(*extras):
             *[extra["outputs"] for extra in extras if "outputs" in extra]
         ),
         toolchains = [
-            Label("//scala:toolchain_type"),
+            "//scala:toolchain_type",
             "@bazel_tools//tools/jdk:toolchain_type",
         ],
         cfg = scala_version_transition,
@@ -285,7 +283,7 @@ def make_scala_macro_library(*extras):
             *[extra["outputs"] for extra in extras if "outputs" in extra]
         ),
         toolchains = [
-            Label("//scala:toolchain_type"),
+            "//scala:toolchain_type",
             "@bazel_tools//tools/jdk:toolchain_type",
         ],
         cfg = scala_version_transition,

scala/private/rules/scala_repl.bzl

@@ -84,7 +84,7 @@ def make_scala_repl(*extras):
             *[extra["outputs"] for extra in extras if "outputs" in extra]
         ),
         toolchains = [
-            Label("//scala:toolchain_type"),
+            "//scala:toolchain_type",
             "@bazel_tools//tools/jdk:toolchain_type",
         ],
         cfg = scala_version_transition,