Cleaned up the imports in src/main/scala

jadenPete-lucid · jadenPete-lucid · commit 321e0a9ff7b6 · 2025-06-24T17:01:26.000-04:00
diff --git a/.bazelrc_shared b/.bazelrc_shared
@@ -20,7 +20,6 @@ common --modify_execution_info=CppArchive=+supports-path-mapping
 common --modify_execution_info=CppCompile=+supports-path-mapping
 common --modify_execution_info=CppModuleMap=+supports-path-mapping
 
-common --announce_rc
 common --color=yes
 common:rules --disk_cache=.bazel_cache
 common:tests --disk_cache=../.bazel_cache
@@ -51,3 +50,5 @@ common --incompatible_strict_action_env
 #common --noincompatible_enable_deprecated_label_apis
 
 test --test_output=all
+
+try-import %workspace%/user.bazelrc
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ hash2
 target/
 
 !bazel-*.rc
+/user.bazelrc
 
 # Ignore files generated by IDEs.
 /.classpath
diff --git a/src/main/scala/higherkindness/rules_scala/common/args/ArgsUtil.scala b/src/main/scala/higherkindness/rules_scala/common/args/ArgsUtil.scala
@@ -1,7 +1,6 @@
-package higherkindness.rules_scala
-package common.args
+package higherkindness.rules_scala.common.args
 
-import common.error.AnnexWorkerError
+import higherkindness.rules_scala.common.error.AnnexWorkerError
 import java.io.{PrintStream, PrintWriter}
 import java.nio.file.{Path, Paths}
 import net.sourceforge.argparse4j.helper.HelpScreenException
diff --git a/src/main/scala/higherkindness/rules_scala/common/args/Implicits.scala b/src/main/scala/higherkindness/rules_scala/common/args/Implicits.scala
@@ -1,8 +1,7 @@
-package higherkindness.rules_scala
-package common.args
+package higherkindness.rules_scala.common.args
 
-import scala.reflect.Selectable.reflectiveSelectable
 import net.sourceforge.argparse4j.inf.Argument
+import scala.reflect.Selectable.reflectiveSelectable
 
 object implicits {
   implicit final class SetArgumentDefault(val argument: Argument) extends AnyVal {
diff --git a/src/main/scala/higherkindness/rules_scala/common/classloaders/ClassLoaders.scala b/src/main/scala/higherkindness/rules_scala/common/classloaders/ClassLoaders.scala
@@ -1,5 +1,4 @@
-package higherkindness.rules_scala
-package common.classloaders
+package higherkindness.rules_scala.common.classloaders
 
 import java.net.{URL, URLClassLoader}
 
diff --git a/src/main/scala/higherkindness/rules_scala/common/error/AnnexWorkRequestCancelledException.scala b/src/main/scala/higherkindness/rules_scala/common/error/AnnexWorkRequestCancelledException.scala
@@ -1,5 +1,4 @@
-package higherkindness.rules_scala
-package common.error
+package higherkindness.rules_scala.common.error
 
 class AnnexDuplicateActiveRequestException(
   val message: String = "",
diff --git a/src/main/scala/higherkindness/rules_scala/common/error/AnnexWorkerError.scala b/src/main/scala/higherkindness/rules_scala/common/error/AnnexWorkerError.scala
@@ -1,5 +1,4 @@
-package higherkindness.rules_scala
-package common.error
+package higherkindness.rules_scala.common.error
 
 import java.io.PrintStream
 
diff --git a/src/main/scala/higherkindness/rules_scala/common/interrupt/InterruptUtil.scala b/src/main/scala/higherkindness/rules_scala/common/interrupt/InterruptUtil.scala
@@ -1,5 +1,4 @@
-package higherkindness.rules_scala
-package common.interrupt
+package higherkindness.rules_scala.common.interrupt
 
 import java.util.concurrent.CancellationException
 
diff --git a/src/main/scala/higherkindness/rules_scala/common/sandbox/SandboxUtil.scala b/src/main/scala/higherkindness/rules_scala/common/sandbox/SandboxUtil.scala
@@ -1,5 +1,4 @@
-package higherkindness.rules_scala
-package common.sandbox
+package higherkindness.rules_scala.common.sandbox
 
 import java.io.File
 import java.nio.file.Path
diff --git a/src/main/scala/higherkindness/rules_scala/common/sbt-testing/AnnexTestingLogger.scala b/src/main/scala/higherkindness/rules_scala/common/sbt-testing/AnnexTestingLogger.scala
@@ -1,5 +1,4 @@
-package higherkindness.rules_scala
-package common.sbt_testing
+package higherkindness.rules_scala.common.sbt_testing
 
 import sbt.testing.Logger
 
diff --git a/src/main/scala/higherkindness/rules_scala/common/sbt-testing/JUnitXmlReporter.scala b/src/main/scala/higherkindness/rules_scala/common/sbt-testing/JUnitXmlReporter.scala
@@ -1,9 +1,8 @@
-package higherkindness.rules_scala
-package common.sbt_testing
+package higherkindness.rules_scala.common.sbt_testing
 
 import java.io.{PrintWriter, StringWriter}
+import sbt.testing.Status.{Canceled, Error, Failure, Ignored, Pending, Skipped}
 import sbt.testing.{Event, Status, TestSelector}
-import Status.{Canceled, Error, Failure, Ignored, Pending, Skipped}
 import scala.collection.mutable.ListBuffer
 import scala.xml.{Elem, Utility, XML}
 
diff --git a/src/main/scala/higherkindness/rules_scala/common/sbt-testing/PrefixedTestingLogger.scala b/src/main/scala/higherkindness/rules_scala/common/sbt-testing/PrefixedTestingLogger.scala
@@ -1,5 +1,4 @@
-package higherkindness.rules_scala
-package common.sbt_testing
+package higherkindness.rules_scala.common.sbt_testing
 
 import sbt.testing.Logger
 
diff --git a/src/main/scala/higherkindness/rules_scala/common/sbt-testing/SubprocessRunner.scala b/src/main/scala/higherkindness/rules_scala/common/sbt-testing/SubprocessRunner.scala
@@ -1,7 +1,6 @@
-package higherkindness.rules_scala
-package common.sbt_testing
+package higherkindness.rules_scala.common.sbt_testing
 
-import common.classloaders.ClassLoaders
+import higherkindness.rules_scala.common.classloaders.ClassLoaders
 import java.io.ObjectInputStream
 import java.nio.file.Paths
 import scala.collection.mutable
diff --git a/src/main/scala/higherkindness/rules_scala/common/sbt-testing/Test.scala b/src/main/scala/higherkindness/rules_scala/common/sbt-testing/Test.scala
@@ -1,5 +1,4 @@
-package higherkindness.rules_scala
-package common.sbt_testing
+package higherkindness.rules_scala.common.sbt_testing
 
 import sbt.testing.{Event, Fingerprint, Framework, Logger, Runner, Status, Task, TaskDef, TestWildcardSelector}
 import scala.collection.mutable
diff --git a/src/main/scala/higherkindness/rules_scala/common/sbt-testing/TestRequest.scala b/src/main/scala/higherkindness/rules_scala/common/sbt-testing/TestRequest.scala
@@ -1,5 +1,4 @@
-package higherkindness.rules_scala
-package common.sbt_testing
+package higherkindness.rules_scala.common.sbt_testing
 
 import sbt.testing.Logger
 
diff --git a/src/main/scala/higherkindness/rules_scala/common/sbt-testing/Verbosity.scala b/src/main/scala/higherkindness/rules_scala/common/sbt-testing/Verbosity.scala
@@ -1,5 +1,4 @@
-package higherkindness.rules_scala
-package common.sbt_testing
+package higherkindness.rules_scala.common.sbt_testing
 
 sealed abstract class Verbosity(val level: String)
 object Verbosity {
diff --git a/src/main/scala/higherkindness/rules_scala/common/sbt-testing/fingerprints.scala b/src/main/scala/higherkindness/rules_scala/common/sbt-testing/fingerprints.scala
@@ -1,5 +1,4 @@
-package higherkindness.rules_scala
-package common.sbt_testing
+package higherkindness.rules_scala.common.sbt_testing
 
 import sbt.testing.{AnnotatedFingerprint, SubclassFingerprint}
 
diff --git a/src/main/scala/higherkindness/rules_scala/common/worker/CancellableTask.scala b/src/main/scala/higherkindness/rules_scala/common/worker/CancellableTask.scala
@@ -1,7 +1,6 @@
-package higherkindness.rules_scala
-package common.worker
+package higherkindness.rules_scala.common.worker
 
-import java.util.concurrent.{Callable, FutureTask}
+import java.util.concurrent.Callable
 import scala.concurrent.{ExecutionContext, ExecutionException, Future, Promise}
 import scala.util.Try
 
diff --git a/src/main/scala/higherkindness/rules_scala/common/worker/FutureTaskWaitOnCancel.scala b/src/main/scala/higherkindness/rules_scala/common/worker/FutureTaskWaitOnCancel.scala
@@ -1,5 +1,4 @@
-package higherkindness.rules_scala
-package common.worker
+package higherkindness.rules_scala.common.worker
 
 import java.util.concurrent.{Callable, CancellationException, FutureTask, TimeUnit}
 import java.util.concurrent.locks.ReentrantLock
diff --git a/src/main/scala/higherkindness/rules_scala/common/worker/WorkTask.scala b/src/main/scala/higherkindness/rules_scala/common/worker/WorkTask.scala
@@ -1,5 +1,4 @@
-package higherkindness.rules_scala
-package common.worker
+package higherkindness.rules_scala.common.worker
 
 import java.io.PrintStream
 import java.nio.file.Path
diff --git a/src/main/scala/higherkindness/rules_scala/common/worker/WorkerMain.scala b/src/main/scala/higherkindness/rules_scala/common/worker/WorkerMain.scala
@@ -1,12 +1,11 @@
-package higherkindness.rules_scala
-package common.worker
+package higherkindness.rules_scala.common.worker
 
-import common.error.{AnnexDuplicateActiveRequestException, AnnexWorkerError}
+import higherkindness.rules_scala.common.error.{AnnexDuplicateActiveRequestException, AnnexWorkerError}
 import com.google.devtools.build.lib.worker.WorkerProtocol
 import java.io.{ByteArrayInputStream, ByteArrayOutputStream, InputStream, OutputStream, PrintStream}
 import java.nio.channels.ClosedByInterruptException
-import java.nio.file.{Path, Paths}
-import java.util.concurrent.{Callable, CancellationException, ConcurrentHashMap, ForkJoinPool, FutureTask}
+import java.nio.file.Path
+import java.util.concurrent.{CancellationException, ConcurrentHashMap, ForkJoinPool}
 import scala.annotation.tailrec
 import scala.concurrent.{ExecutionContext, ExecutionException, Future}
 import scala.util.{Failure, Success, Using}
diff --git a/src/main/scala/higherkindness/rules_scala/workers/bloop/compile/BloopRunner.scala b/src/main/scala/higherkindness/rules_scala/workers/bloop/compile/BloopRunner.scala
@@ -1,11 +1,7 @@
-package higherkindness.rules_scala
-package workers.bloop.compile
-
-import common.worker.{WorkTask, WorkerMain}
+package higherkindness.rules_scala.workers.bloop.compile
 
 import bloop.Bloop
-import java.io.PrintStream
-import java.nio.file.Path
+import higherkindness.rules_scala.common.worker.{WorkTask, WorkerMain}
 
 object BloopRunner extends WorkerMain[Unit] {
   override def init(args: Option[Array[String]]): Unit = ()
diff --git a/src/main/scala/higherkindness/rules_scala/workers/common/AnalysisUtil.scala b/src/main/scala/higherkindness/rules_scala/workers/common/AnalysisUtil.scala
@@ -1,8 +1,7 @@
-package higherkindness.rules_scala
-package workers.common
+package higherkindness.rules_scala.workers.common
 
 import java.io.File
-import java.nio.file.{Path, Paths}
+import java.nio.file.Path
 import sbt.internal.inc
 import sbt.internal.inc.consistent.ConsistentFileAnalysisStore
 import xsbti.compile.AnalysisStore
diff --git a/src/main/scala/higherkindness/rules_scala/workers/common/AnnexLogger.scala b/src/main/scala/higherkindness/rules_scala/workers/common/AnnexLogger.scala
@@ -1,10 +1,9 @@
-package higherkindness.rules_scala
-package workers.common
+package higherkindness.rules_scala.workers.common
 
-import xsbti.Logger
 import java.io.{PrintStream, PrintWriter, StringWriter}
-import java.nio.file.{Path, Paths}
+import java.nio.file.Path
 import java.util.function.Supplier
+import xsbti.Logger
 
 final class AnnexLogger(level: LogLevel, workDir: Path, out: PrintStream) extends Logger {
 
diff --git a/src/main/scala/higherkindness/rules_scala/workers/common/AnnexMapper.scala b/src/main/scala/higherkindness/rules_scala/workers/common/AnnexMapper.scala
@@ -1,28 +1,11 @@
-package higherkindness.rules_scala
-package workers.common
+package higherkindness.rules_scala.workers.common
 
 import com.google.devtools.build.buildjar.jarhelper.JarHelper
-import java.io.{File, InputStream, OutputStream, OutputStreamWriter}
-import java.nio.charset.StandardCharsets
-import java.nio.file.{Files, NoSuchFileException, Path, Paths}
-import java.nio.file.attribute.FileTime
-import java.util
-import java.util.concurrent.ConcurrentHashMap
-import java.util.LinkedHashMap
-import java.util.zip.{GZIPInputStream, GZIPOutputStream}
-import java.util.Optional
-import sbt.internal.inc.binary.converters.{ProtobufReaders, ProtobufWriters}
-import sbt.internal.inc.Schema.Type.{Projection, Structure}
-import sbt.internal.inc.{APIs, Analysis, FarmHash, Hash, LastModified, PlainVirtualFile, PlainVirtualFileConverter, Relations, Schema, SourceInfos, Stamp as StampImpl, Stamper, Stamps}
-import sbt.internal.inc.Schema.{Access, AnalyzedClass, Annotation, AnnotationArgument, ClassDefinition, ClassDependencies, ClassLike, Companions, MethodParameter, NameHash, ParameterList, Path as SchemaPath, Qualifier, Type, TypeParameter, UsedName, UsedNames, Values}
-import sbt.internal.shaded.com.google.protobuf.GeneratedMessageV3
-import sbt.io.IO
-import scala.collection.immutable.TreeMap
-import xsbti.compile.analysis.{GenericMapper, ReadMapper, ReadWriteMappers, Stamp, WriteMapper}
-import xsbti.compile.{AnalysisContents, AnalysisStore, MiniSetup}
-import scala.jdk.CollectionConverters.*
+import java.nio.file.{Path, Paths}
+import sbt.internal.inc.{FarmHash, Hash, LastModified, PlainVirtualFile, PlainVirtualFileConverter, Stamper}
 import xsbti.VirtualFileRef
-import java.util.Objects
+import xsbti.compile.MiniSetup
+import xsbti.compile.analysis.{ReadMapper, ReadWriteMappers, Stamp, WriteMapper}
 
 object AnnexMapper {
   val rootPlaceholder = Paths.get("_ROOT_")
diff --git a/src/main/scala/higherkindness/rules_scala/workers/common/AnnexScalaInstance.scala b/src/main/scala/higherkindness/rules_scala/workers/common/AnnexScalaInstance.scala
@@ -1,14 +1,12 @@
-package higherkindness.rules_scala
-package workers.common
+package higherkindness.rules_scala.workers.common
 
-import xsbti.compile.ScalaInstance
 import java.io.{File, IOException}
 import java.net.URLClassLoader
 import java.nio.file.{AtomicMoveNotSupportedException, FileAlreadyExistsException, Files, Path, Paths, StandardCopyOption}
 import java.util.Properties
 import java.util.concurrent.ConcurrentHashMap
-import scala.collection.immutable.TreeMap
 import scala.util.control.NonFatal
+import xsbti.compile.ScalaInstance
 
 object AnnexScalaInstance {
   // See the comment on getAnnexScalaInstance as to why this is necessary
diff --git a/src/main/scala/higherkindness/rules_scala/workers/common/Color.scala b/src/main/scala/higherkindness/rules_scala/workers/common/Color.scala
@@ -1,8 +1,6 @@
-package higherkindness.rules_scala
-package workers.common
+package higherkindness.rules_scala.workers.common
 
-import xsbti.Problem
-import Console.{GREEN as CG, RED as CR, RESET as CRESET, YELLOW as CY}
+import scala.Console.{GREEN as CG, RED as CR, RESET as CRESET, YELLOW as CY}
 
 object Color {
   def Info(message: String): String = colorString(message, CG, "Info")
diff --git a/src/main/scala/higherkindness/rules_scala/workers/common/CommonArguments.scala b/src/main/scala/higherkindness/rules_scala/workers/common/CommonArguments.scala
@@ -1,17 +1,13 @@
-package higherkindness.rules_scala
-package workers.common
+package higherkindness.rules_scala.workers.common
 
-import common.args.ArgsUtil.PathArgumentType
-import common.args.implicits.*
-import common.sandbox.SandboxUtil
-import net.sourceforge.argparse4j.impl.Arguments as ArgumentsImpl
-import net.sourceforge.argparse4j.inf.{Argument, ArgumentParser, ArgumentType, Namespace}
+import higherkindness.rules_scala.common.args.ArgsUtil.PathArgumentType
+import higherkindness.rules_scala.common.args.implicits.*
+import higherkindness.rules_scala.common.sandbox.SandboxUtil
+import java.nio.file.{Path, Paths}
 import java.util.{Collections, List as JList}
-import scala.annotation.nowarn
-import scala.collection.mutable.Buffer
+import net.sourceforge.argparse4j.impl.Arguments as ArgumentsImpl
+import net.sourceforge.argparse4j.inf.{ArgumentParser, Namespace}
 import scala.jdk.CollectionConverters.*
-import java.io.File
-import java.nio.file.{Path, Paths}
 
 class CommonArguments private (
   val analyses: List[Analysis],
diff --git a/src/main/scala/higherkindness/rules_scala/workers/common/FileUtil.scala b/src/main/scala/higherkindness/rules_scala/workers/common/FileUtil.scala
@@ -1,12 +1,11 @@
-package higherkindness.rules_scala
-package workers.common
+package higherkindness.rules_scala.workers.common
 
-import scala.annotation.tailrec
 import java.io.{File, IOException}
 import java.nio.channels.FileChannel
-import java.nio.file.{FileAlreadyExistsException, FileVisitResult, Files, Path, Paths, SimpleFileVisitor, StandardCopyOption, StandardOpenOption}
 import java.nio.file.attribute.BasicFileAttributes
+import java.nio.file.{FileAlreadyExistsException, FileVisitResult, Files, Path, Paths, SimpleFileVisitor, StandardCopyOption, StandardOpenOption}
 import java.util.zip.{ZipEntry, ZipInputStream, ZipOutputStream}
+import scala.annotation.tailrec
 
 class CopyFileVisitor(source: Path, target: Path) extends SimpleFileVisitor[Path] {
   override def preVisitDirectory(directory: Path, attributes: BasicFileAttributes) = {
diff --git a/src/main/scala/higherkindness/rules_scala/workers/common/LogLevel.scala b/src/main/scala/higherkindness/rules_scala/workers/common/LogLevel.scala
@@ -1,5 +1,4 @@
-package higherkindness.rules_scala
-package workers.common
+package higherkindness.rules_scala.workers.common
 
 sealed abstract class LogLevel(val level: String)
 object LogLevel {
diff --git a/src/main/scala/higherkindness/rules_scala/workers/common/LoggedReporter.scala b/src/main/scala/higherkindness/rules_scala/workers/common/LoggedReporter.scala
@@ -1,8 +1,7 @@
-package higherkindness.rules_scala
-package workers.common
+package higherkindness.rules_scala.workers.common
 
-import xsbti.{Logger, Problem}
 import sbt.internal.inc.{LoggedReporter as SbtLoggedReporter, ProblemStringFormats}
+import xsbti.{Logger, Problem}
 
 class LoggedReporter(logger: Logger, versionString: String) extends SbtLoggedReporter(0, logger) {
   private val problemStringFormats = new ProblemStringFormats {}
diff --git a/src/main/scala/higherkindness/rules_scala/workers/deps/DepsRunner.scala b/src/main/scala/higherkindness/rules_scala/workers/deps/DepsRunner.scala
@@ -1,16 +1,14 @@
-package higherkindness.rules_scala
-package workers.deps
-
-import common.args.ArgsUtil
-import common.args.ArgsUtil.PathArgumentType
-import common.args.implicits.*
-import common.error.AnnexWorkerError
-import common.interrupt.InterruptUtil
-import common.sandbox.SandboxUtil
-import common.worker.{WorkTask, WorkerMain}
-import workers.common.AnnexMapper
-import workers.common.FileUtil
-import java.io.{File, PrintStream}
+package higherkindness.rules_scala.workers.deps
+
+import higherkindness.rules_scala.common.args.ArgsUtil
+import higherkindness.rules_scala.common.args.ArgsUtil.PathArgumentType
+import higherkindness.rules_scala.common.args.implicits.*
+import higherkindness.rules_scala.common.error.AnnexWorkerError
+import higherkindness.rules_scala.common.interrupt.InterruptUtil
+import higherkindness.rules_scala.common.sandbox.SandboxUtil
+import higherkindness.rules_scala.common.worker.{WorkTask, WorkerMain}
+import higherkindness.rules_scala.workers.common.AnnexMapper
+import higherkindness.rules_scala.workers.common.FileUtil
 import java.nio.file.{FileAlreadyExistsException, Files, Path, Paths}
 import java.util.Collections
 import net.sourceforge.argparse4j.ArgumentParsers
diff --git a/src/main/scala/higherkindness/rules_scala/workers/jacoco/instrumenter/JacocoInstrumenter.scala b/src/main/scala/higherkindness/rules_scala/workers/jacoco/instrumenter/JacocoInstrumenter.scala
diff --git a/src/main/scala/higherkindness/rules_scala/workers/zinc/compile/Deps.scala b/src/main/scala/higherkindness/rules_scala/workers/zinc/compile/Deps.scala
diff --git a/src/main/scala/higherkindness/rules_scala/workers/zinc/compile/FilteredInfos.scala b/src/main/scala/higherkindness/rules_scala/workers/zinc/compile/FilteredInfos.scala
diff --git a/src/main/scala/higherkindness/rules_scala/workers/zinc/compile/ZincPersistence.scala b/src/main/scala/higherkindness/rules_scala/workers/zinc/compile/ZincPersistence.scala
diff --git a/src/main/scala/higherkindness/rules_scala/workers/zinc/compile/ZincRunner.scala b/src/main/scala/higherkindness/rules_scala/workers/zinc/compile/ZincRunner.scala
diff --git a/src/main/scala/higherkindness/rules_scala/workers/zinc/doc/DocRunner.scala b/src/main/scala/higherkindness/rules_scala/workers/zinc/doc/DocRunner.scala
diff --git a/src/main/scala/higherkindness/rules_scala/workers/zinc/repl/ReplRunner.scala b/src/main/scala/higherkindness/rules_scala/workers/zinc/repl/ReplRunner.scala
diff --git a/src/main/scala/higherkindness/rules_scala/workers/zinc/test/TestDiscovery.scala b/src/main/scala/higherkindness/rules_scala/workers/zinc/test/TestDiscovery.scala
diff --git a/src/main/scala/higherkindness/rules_scala/workers/zinc/test/TestFrameworkRunner.scala b/src/main/scala/higherkindness/rules_scala/workers/zinc/test/TestFrameworkRunner.scala
diff --git a/src/main/scala/higherkindness/rules_scala/workers/zinc/test/TestRunner.scala b/src/main/scala/higherkindness/rules_scala/workers/zinc/test/TestRunner.scala
