Ripped out the remaining Zinc-related code

Author: jadenPete-lucid

rules/private/phases/phase_test_launcher.bzl

@@ -22,10 +22,7 @@ def phase_test_launcher(ctx, g):
     # "When attaching a transition to an outgoing edge (regardless of whether the transition is a
     # 1:1 or 1:2+ transition), `ctx.attr` is forced to be a list if it isn't already. The order of
     # elements in this list is unspecified."
-    files = ctx.attr._target_jdk[0][java_common.JavaRuntimeInfo].files.to_list() + [
-        g.compile.zinc_info.analysis_store,
-        g.compile.tests_file,
-    ]
+    files = ctx.attr._target_jdk[0][java_common.JavaRuntimeInfo].files.to_list() + [g.compile.tests_file]
 
     coverage_replacements = {}
     coverage_runner_jars = depset(direct = [])
@@ -44,7 +41,6 @@ def phase_test_launcher(ctx, g):
     all_jars = [test_jars, runner_jars]
 
     args = ctx.actions.args()
-    args.add("--analysis_store", g.compile.zinc_info.analysis_store.short_path)
     args.add("--tests_file", g.compile.tests_file.short_path)
     if ctx.attr.isolation == "classloader":
         shared_deps = java_common.merge(_collect(JavaInfo, ctx.attr.shared_deps))

rules/private/phases/phase_zinc_compile.bzl

@@ -4,9 +4,6 @@ load(
     "@rules_scala_annex//rules:providers.bzl",
     _ScalaConfiguration = "ScalaConfiguration",
     _ZincCompilationInfo = "ZincCompilationInfo",
-    _ZincConfiguration = "ZincConfiguration",
-    _ZincDepInfo = "ZincDepInfo",
-    _ZincInfo = "ZincInfo",
 )
 
 #
@@ -17,8 +14,6 @@ load(
 
 def phase_zinc_compile(ctx, g):
     toolchain = ctx.toolchains["//rules/scala:toolchain_type"]
-    analysis_store = ctx.actions.declare_file("{}/analysis_store.gz".format(ctx.label.name))
-    analysis_store_text = ctx.actions.declare_file("{}/analysis_store.text.gz".format(ctx.label.name))
     mains_file = ctx.actions.declare_file("{}.jar.mains.txt".format(ctx.label.name))
     used = ctx.actions.declare_file("{}/deps_used.txt".format(ctx.label.name))
     tmp = ctx.actions.declare_directory("{}/tmp".format(ctx.label.name))
@@ -34,21 +29,16 @@ def phase_zinc_compile(ctx, g):
         )
     ]
 
-    zincs = [dep[_ZincInfo] for dep in ctx.attr.deps if _ZincInfo in dep]
     common_scalacopts = toolchain.scala_configuration.global_scalacopts + ctx.attr.scalacopts
 
     args = ctx.actions.args()
-    if toolchain.zinc_configuration.incremental:
-        args.add_all(depset(transitive = [zinc.deps for zinc in zincs]), map_each = _compile_analysis)
-
     args.add("--compiler_bridge", toolchain.zinc_configuration.compiler_bridge)
     args.add_all("--compiler_classpath", g.classpaths.compiler)
     args.add_all("--classpath", g.classpaths.compile)
     args.add_all(common_scalacopts, format_each = "--compiler_option=%s")
     args.add_all(javacopts, format_each = "--java_compiler_option=%s")
     args.add(ctx.label, format = "--label=%s")
     args.add("--main_manifest", mains_file)
-    args.add("--output_analysis_store", analysis_store)
     args.add("--output_jar", g.classpaths.jar)
     args.add("--output_used", used)
     args.add_all("--plugins", g.classpaths.plugin)
@@ -58,29 +48,16 @@ def phase_zinc_compile(ctx, g):
 
     g.semanticdb.arguments_modifier(args)
 
-    args.add_all("--", g.classpaths.srcs)
-    args.set_param_file_format("multiline")
-    args.use_param_file("@%s", use_always = True)
-
-    worker = toolchain.zinc_configuration.compile_worker
-
     inputs = depset(
         [toolchain.zinc_configuration.compiler_bridge] + ctx.files.data + ctx.files.srcs,
         transitive = [
             g.classpaths.plugin,
             g.classpaths.compile,
             g.classpaths.compiler,
-        ] + ([zinc.deps_files for zinc in zincs] if toolchain.zinc_configuration.incremental else []),
+        ],
     )
 
-    outputs = [
-        g.classpaths.jar,
-        mains_file,
-        analysis_store,
-        analysis_store_text,
-        used,
-        tmp,
-    ] + g.semanticdb.outputs
+    outputs = [g.classpaths.jar, mains_file, used, tmp] + g.semanticdb.outputs
 
     if hasattr(ctx.attr, "frameworks"):
         tests_file = ctx.actions.declare_file("{}/tests.json".format(ctx.label.name))
@@ -92,6 +69,12 @@ def phase_zinc_compile(ctx, g):
     else:
         tests_file = None
 
+    args.add_all("--", g.classpaths.srcs)
+    args.set_param_file_format("multiline")
+    args.use_param_file("@%s", use_always = True)
+
+    worker = toolchain.zinc_configuration.compile_worker
+
     execution_requirements_tags = {
         "supports-multiplex-workers": "1",
         "supports-workers": "1",
@@ -100,16 +83,6 @@ def phase_zinc_compile(ctx, g):
         "supports-path-mapping": "1",
     }
 
-    # Disable several things if incremental compilation features are going to be used
-    # because incremental compilation require stashing files outside the sandbox that
-    # Bazel isn't aware of and is less deterministic than ideal.
-    if toolchain.zinc_configuration.incremental:
-        execution_requirements_tags["no-sandbox"] = "1"
-        execution_requirements_tags["no-cache"] = "1"
-        execution_requirements_tags["no-remote"] = "1"
-        execution_requirements_tags["supports-multiplex-sandboxing"] = "0"
-        execution_requirements_tags["supports-path-mapping"] = "0"
-
     # todo: different execution path for nosrc jar?
     ctx.actions.run(
         arguments = [args],
@@ -126,32 +99,9 @@ def phase_zinc_compile(ctx, g):
     for jar in g.javainfo.java_info.outputs.jars:
         jars.append(jar.class_jar)
         jars.append(jar.ijar)
-    zinc_info = _ZincInfo(
-        analysis_store = analysis_store,
-        deps_files = depset([analysis_store], transitive = [zinc.deps_files for zinc in zincs]),
-        label = ctx.label,
-        deps = depset(
-            [_ZincDepInfo(
-                analysis_store = analysis_store,
-                jars = tuple(jars),
-                label = ctx.label,
-            )],
-            transitive = [zinc.deps for zinc in zincs],
-        ),
-    )
 
-    g.out.providers.append(zinc_info)
     return _ZincCompilationInfo(
         mains_file = mains_file,
         tests_file = tests_file,
         used = used,
-        # todo: see about cleaning up & generalizing fields below
-        zinc_info = zinc_info,
     )
-
-def _compile_analysis(analysis):
-    return [
-        "--analysis",
-        "_{}".format(analysis.label),
-        analysis.analysis_store.path,
-    ] + [jar.path for jar in analysis.jars]

rules/providers.bzl

@@ -25,7 +25,6 @@ ZincConfiguration = provider(
         "compiler_bridge": "compiled Zinc compiler bridge",
         "compile_worker": "the worker label for compilation with Zinc",
         "log_level": "log level for the Zinc compiler",
-        "incremental": "whether incremental compilation will be available for this Zinc compiler",
     },
 )
 
@@ -52,16 +51,6 @@ ScalaRulePhase = provider(
     },
 )
 
-ZincInfo = provider(
-    doc = "Zinc-specific outputs.",
-    fields = {
-        "analysis_store": "The analysis store file.",
-        "deps": "The depset of library dependency outputs.",
-        "deps_files": "The depset of all Zinc files.",
-        "label": "The label for this output.",
-    },
-)
-
 # TODO: move these to another file?
 # TODO: implement these with an aspect?
 
@@ -185,15 +174,5 @@ ZincCompilationInfo = provider(
         "mains_file": "File containing the main methods of this compilation.",
         "tests_file": "File containing discovered tests for use by the test runner. Will be `None` if this isn't a test target.",
         "used": "File containing the used deps for this compilation.",
-        "zinc_info": "a ZincInfo provider for this compilation.",
-    },
-)
-
-ZincDepInfo = provider(
-    doc = "Information for a dep in a ZincInfo",
-    fields = {
-        "analysis_store": "Analysis store for this label",
-        "jars": "Jars for this label",
-        "label": "The label for this dep",
     },
 )

rules/register_toolchain.bzl

@@ -90,7 +90,6 @@ def _zinc_configuration_impl(ctx):
             zinc_configuration = ZincConfiguration(
                 compile_worker = ctx.attr._compile_worker,
                 compiler_bridge = ctx.file.compiler_bridge,
-                incremental = ctx.attr.incremental,
                 log_level = ctx.attr.log_level,
             ),
             deps_configuration = DepsConfiguration(
@@ -135,7 +134,6 @@ off: Don't perform unused dependency checking.""",
         ),
         "global_plugins": attr.label_list(providers = [JavaInfo]),
         "global_scalacopts": attr.string_list(),
-        "incremental": attr.bool(default = False),
         "log_level": attr.string(
             default = "warn",
             values = ["error", "warn", "info", "debug", "none"],

src/main/scala/higherkindness/rules_scala/workers/common/AnalysisUtil.scala

@@ -2,15 +2,15 @@ package higherkindness.rules_scala.workers.common
 
 import com.google.devtools.build.buildjar.jarhelper.JarHelper
 import java.nio.file.{Path, Paths}
-import sbt.internal.inc.{FarmHash, Hash, LastModified, PlainVirtualFile, PlainVirtualFileConverter, Stamper}
+import sbt.internal.inc.{FarmHash, Hash, LastModified, PlainVirtualFile, PlainVirtualFileConverter}
 import xsbti.VirtualFileRef
 import xsbti.compile.MiniSetup
 import xsbti.compile.analysis.{ReadMapper, ReadWriteMappers, Stamp, WriteMapper}
 
 object AnnexMapper {
   val rootPlaceholder = Paths.get("_ROOT_")
-  def mappers(root: Path, isIncremental: Boolean) = {
-    new ReadWriteMappers(new AnxReadMapper(root, isIncremental), new AnxWriteMapper(root))
+  def mappers(root: Path) = {
+    new ReadWriteMappers(new AnxReadMapper(root), new AnxWriteMapper(root))
   }
 
   /**
@@ -27,31 +27,6 @@ object AnnexMapper {
       case _ => throw new Exception(s"Unexpected Stamp type encountered when writing. ${stamp.getClass} -- $stamp")
     }
   }
-
-  final def getReadStamp(file: VirtualFileRef, stamp: Stamp, isIncremental: Boolean): Stamp = {
-    if (isIncremental) {
-      getIncrementalModeReadStamp(file, stamp)
-    } else {
-      stamp
-    }
-  }
-
-  /**
-   * When in incremental mode we do not want to rely on the timestamp from the AnalysisStore because we're assuming it
-   * was set to a constant value when written to the AnalysisStore.
-   *
-   * Instead, for any LastModified stamps, we read the file's time stamp from disk.
-   */
-  final def getIncrementalModeReadStamp(file: VirtualFileRef, stamp: Stamp): Stamp = {
-    stamp match {
-      case farmHash: FarmHash         => farmHash
-      case hash: Hash                 => hash
-      case lastModified: LastModified => {
-        Stamper.forLastModifiedP(PlainVirtualFileConverter.converter.toPath(file))
-      }
-      case _ => throw new Exception(s"Unexpected Stamp type encountered when reading ${stamp.getClass} -- $stamp")
-    }
-  }
 }
 
 final class AnxWriteMapper(root: Path) extends WriteMapper {
@@ -93,7 +68,7 @@ final class AnxWriteMapper(root: Path) extends WriteMapper {
   override def mapMiniSetup(miniSetup: MiniSetup): MiniSetup = miniSetup
 }
 
-final class AnxReadMapper(root: Path, isIncremental: Boolean) extends ReadMapper {
+final class AnxReadMapper(root: Path) extends ReadMapper {
   private val rootAbs = root.toAbsolutePath().normalize()
 
   private def mapFile(virtualFileRef: VirtualFileRef): Path = {
@@ -119,15 +94,9 @@ final class AnxReadMapper(root: Path, isIncremental: Boolean) extends ReadMapper
   override def mapOutputDir(outputDir: Path): Path = mapFile(outputDir)
   override def mapSourceDir(sourceDir: Path): Path = mapFile(sourceDir)
 
-  override def mapSourceStamp(file: VirtualFileRef, sourceStamp: Stamp): Stamp = {
-    AnnexMapper.getReadStamp(file, sourceStamp, isIncremental)
-  }
-  override def mapBinaryStamp(file: VirtualFileRef, binaryStamp: Stamp): Stamp = {
-    AnnexMapper.getReadStamp(file, binaryStamp, isIncremental)
-  }
-  override def mapProductStamp(file: VirtualFileRef, productStamp: Stamp): Stamp = {
-    AnnexMapper.getReadStamp(file, productStamp, isIncremental)
-  }
+  override def mapSourceStamp(file: VirtualFileRef, sourceStamp: Stamp): Stamp = sourceStamp
+  override def mapBinaryStamp(file: VirtualFileRef, binaryStamp: Stamp): Stamp = binaryStamp
+  override def mapProductStamp(file: VirtualFileRef, productStamp: Stamp): Stamp = productStamp
 
   override def mapMiniSetup(miniSetup: MiniSetup): MiniSetup = miniSetup
 }