Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions core/eval/src/mill/eval/EvaluatorImpl.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import mill.resolve.{ParseArgs, Resolve}
* As well as [[evaluate]] which does all of these phases one after another
*/

final class EvaluatorImpl private[mill] (
private[mill] val allowPositionalCommandArgs: Boolean,
private[mill] val selectiveExecution: Boolean,
final class EvaluatorImpl(
val allowPositionalCommandArgs: Boolean,
val selectiveExecution: Boolean,
private val execution: Execution,
private[mill] override val scriptModuleInit: (
override val scriptModuleInit: (
String,
Evaluator
) => Seq[Result[ExternalModule]]
Expand All @@ -40,15 +40,15 @@ final class EvaluatorImpl private[mill] (
)
override val staticBuildOverrides = execution.staticBuildOverrides

private[mill] def workspace = execution.workspace
private[mill] def baseLogger = execution.baseLogger
private[mill] def outPath = execution.outPath
private[mill] def codeSignatures = execution.codeSignatures
private[mill] def rootModule = execution.rootModule.asInstanceOf[RootModule0]
private[mill] def workerCache = execution.workerCache
private[mill] def env = execution.env
private[mill] def effectiveThreadCount = execution.effectiveThreadCount
override private[mill] def offline: Boolean = execution.offline
def workspace = execution.workspace
def baseLogger = execution.baseLogger
def outPath = execution.outPath
def codeSignatures = execution.codeSignatures
def rootModule = execution.rootModule.asInstanceOf[RootModule0]
def workerCache = execution.workerCache
def env = execution.env
def effectiveThreadCount = execution.effectiveThreadCount
override def offline: Boolean = execution.offline

def withBaseLogger(newBaseLogger: Logger): Evaluator = new EvaluatorImpl(
allowPositionalCommandArgs,
Expand Down
2 changes: 1 addition & 1 deletion core/eval/src/mill/eval/SelectiveExecutionImpl.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import mill.exec.{CodeSigUtils, Execution, PlanImpl}
import mill.internal.SpanningForest
import mill.internal.SpanningForest.breadthFirst

private[mill] class SelectiveExecutionImpl(evaluator: Evaluator)
class SelectiveExecutionImpl(evaluator: Evaluator)
extends mill.api.SelectiveExecution {

def computeHashCodeSignatures(
Expand Down
2 changes: 1 addition & 1 deletion core/exec/src/mill/exec/CodeSigUtils.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import mill.api.{Task, Segment}
import scala.reflect.NameTransformer.encode
import java.lang.reflect.Method

private[mill] object CodeSigUtils {
object CodeSigUtils {
def precomputeMethodNamesPerClass(transitiveNamed: Seq[Task.Named[?]])
: (Map[Class[?], IndexedSeq[Class[?]]], Map[Class[?], Map[String, Method]]) = {

Expand Down
4 changes: 2 additions & 2 deletions core/exec/src/mill/exec/Execution.scala
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import scala.concurrent.*
/**
* Core logic of evaluating tasks, without any user-facing helper methods
*/
private[mill] case class Execution(
case class Execution(
baseLogger: Logger,
profileLogger: JsonArrayLogger.Profile,
workspace: os.Path,
Expand Down Expand Up @@ -347,7 +347,7 @@ private[mill] case class Execution(
}
}

private[mill] object Execution {
object Execution {

/**
* Format a failed count as a string to be used in status messages.
Expand Down
2 changes: 1 addition & 1 deletion core/exec/src/mill/exec/PlanImpl.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import mill.api.{Plan, Task}
import mill.api.MultiBiMap
import mill.api.TopoSorted

private[mill] object PlanImpl {
object PlanImpl {
def plan(goals: Seq[Task[?]]): Plan = {
val transitive = PlanImpl.transitiveTasks(goals.toIndexedSeq)
val goalSet = goals.toSet
Expand Down
4 changes: 2 additions & 2 deletions core/internal/src/mill/internal/AnsiNav.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package mill.internal
import java.io.Writer

// Reference https://gist.github.com/fnky/458719343aabd01cfb17a3a4f7296797
private[mill] class AnsiNav(output: Writer) {
class AnsiNav(output: Writer) {
def control(n: Int, c: Char): Unit = output.write(AnsiNav.control(n, c))

/**
Expand Down Expand Up @@ -45,7 +45,7 @@ private[mill] class AnsiNav(output: Writer) {
def clearLine(n: Int): Unit = output.write(AnsiNav.clearLine(n))
}

private[mill] object AnsiNav {
object AnsiNav {
def control(n: Int, c: Char): String = "\u001b[" + n + c
def up(n: Int): String = if (n != 0) control(n, 'A') else ""
def down(n: Int): String = if (n != 0) control(n, 'B') else ""
Expand Down
4 changes: 2 additions & 2 deletions core/internal/src/mill/internal/Colors.scala
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package mill.internal

private[mill] case class Colors(info: fansi.Attrs, warn: fansi.Attrs, error: fansi.Attrs)
private[mill] object Colors {
case class Colors(info: fansi.Attrs, warn: fansi.Attrs, error: fansi.Attrs)
object Colors {
object Default extends Colors(fansi.Color.Blue, fansi.Color.Yellow, fansi.Color.Red)
object BlackWhite extends Colors(fansi.Attrs.Empty, fansi.Attrs.Empty, fansi.Attrs.Empty)
}
2 changes: 1 addition & 1 deletion core/internal/src/mill/internal/FileLogger.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import mill.api.BuildCtx
import java.io.{OutputStream, PrintStream}
import java.nio.file.{Files, StandardOpenOption}

private[mill] class FileLogger(
class FileLogger(
file: os.Path,
append: Boolean = false
) extends Logger with AutoCloseable {
Expand Down
8 changes: 4 additions & 4 deletions core/internal/src/mill/internal/JsonArrayLogger.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import java.io.{BufferedOutputStream, PrintStream}
import java.nio.file.{Files, StandardOpenOption}
import java.util.concurrent.ArrayBlockingQueue

private[mill] class JsonArrayLogger[T: upickle.Writer](outPath: os.Path, indent: Int) {
class JsonArrayLogger[T: upickle.Writer](outPath: os.Path, indent: Int) {
private var used = false

@volatile var closed = false
Expand Down Expand Up @@ -64,9 +64,9 @@ private[mill] class JsonArrayLogger[T: upickle.Writer](outPath: os.Path, indent:
}
}

private[mill] object JsonArrayLogger {
object JsonArrayLogger {

private[mill] class Profile(outPath: os.Path)
class Profile(outPath: os.Path)
extends JsonArrayLogger[Profile.Timing](outPath, indent = 2) {
def log(
terminal: String,
Expand Down Expand Up @@ -107,7 +107,7 @@ private[mill] object JsonArrayLogger {
}
}

private[mill] class ChromeProfile(outPath: os.Path)
class ChromeProfile(outPath: os.Path)
extends JsonArrayLogger[ChromeProfile.TraceEvent](outPath, indent = -1) {

def logBegin(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import java.io.{ByteArrayOutputStream, OutputStream}
* @param linePrefix The function to provide the prefix.
* @param out The underlying output stream.
*/
private[mill] class LineBufferingOutputStream(onLineComplete: ByteArrayOutputStream => Unit)
class LineBufferingOutputStream(onLineComplete: ByteArrayOutputStream => Unit)
extends OutputStream {

val buffer = new ByteArrayOutputStream()
Expand Down
32 changes: 16 additions & 16 deletions core/internal/src/mill/internal/MultiLogger.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import mill.api.{Logger, SystemStreams}

import java.io.{InputStream, PrintStream, ByteArrayOutputStream}

private[mill] class MultiLogger(
class MultiLogger(
val logger1: Logger,
val logger2: Logger,
val inStream0: InputStream
Expand All @@ -16,7 +16,7 @@ private[mill] class MultiLogger(
inStream0
)

private[mill] override lazy val unprefixedStreams: SystemStreams = new SystemStreams(
override lazy val unprefixedStreams: SystemStreams = new SystemStreams(
new MultiStream(logger1.unprefixedStreams.out, logger2.unprefixedStreams.out),
new MultiStream(logger1.unprefixedStreams.err, logger2.unprefixedStreams.err),
inStream0
Expand Down Expand Up @@ -46,7 +46,7 @@ private[mill] class MultiLogger(
logger2.prompt.setPromptDetail(key, s)
}

private[mill] override def setPromptLine(
override def setPromptLine(
key: Seq[String],
keySuffix: String,
message: String
Expand All @@ -55,7 +55,7 @@ private[mill] class MultiLogger(
logger2.prompt.setPromptLine(key, keySuffix, message)
}

private[mill] override def logPrefixedLine(
override def logPrefixedLine(
key: Seq[String],
logMsg: ByteArrayOutputStream,
logToOut: Boolean
Expand All @@ -64,26 +64,26 @@ private[mill] class MultiLogger(
logger2.prompt.logPrefixedLine(key, logMsg, logToOut)
}

private[mill] override def clearPromptStatuses(): Unit = {
override def clearPromptStatuses(): Unit = {
logger1.prompt.clearPromptStatuses()
logger2.prompt.clearPromptStatuses()
}

private[mill] override def removePromptLine(key: Seq[String], message: String): Unit = {
override def removePromptLine(key: Seq[String], message: String): Unit = {
logger1.prompt.removePromptLine(key, message)
logger2.prompt.removePromptLine(key, message)
}

private[mill] override def setPromptHeaderPrefix(s: String): Unit = {
override def setPromptHeaderPrefix(s: String): Unit = {
logger1.prompt.setPromptHeaderPrefix(s)
logger2.prompt.setPromptHeaderPrefix(s)
}

private[mill] override def withPromptPaused[T](t: => T): T = {
override def withPromptPaused[T](t: => T): T = {
logger1.prompt.withPromptPaused(logger2.prompt.withPromptPaused(t))
}

private[mill] override def withPromptUnpaused[T](t: => T): T = {
override def withPromptUnpaused[T](t: => T): T = {
logger1.prompt.withPromptUnpaused(logger2.prompt.withPromptUnpaused(t))
}

Expand All @@ -99,22 +99,22 @@ private[mill] class MultiLogger(
logger1.prompt.errorColor(logger2.prompt.errorColor(s))
override def colored: Boolean = logger1.prompt.colored || logger2.prompt.colored

override private[mill] def beginChromeProfileEntry(text: String): Unit = {
override def beginChromeProfileEntry(text: String): Unit = {
logger1.prompt.beginChromeProfileEntry(text)
logger2.prompt.beginChromeProfileEntry(text)
}

override private[mill] def endChromeProfileEntry(): Unit = {
override def endChromeProfileEntry(): Unit = {
logger1.prompt.endChromeProfileEntry()
logger2.prompt.endChromeProfileEntry()
}

override private[mill] def logBeginChromeProfileEntry(message: String, nanoTime: Long) = {
override def logBeginChromeProfileEntry(message: String, nanoTime: Long) = {
logger1.prompt.logBeginChromeProfileEntry(message, nanoTime)
logger2.prompt.logBeginChromeProfileEntry(message, nanoTime)
}

override private[mill] def logEndChromeProfileEntry(nanoTime: Long) = {
override def logEndChromeProfileEntry(nanoTime: Long) = {
logger1.prompt.logEndChromeProfileEntry(nanoTime)
logger2.prompt.logEndChromeProfileEntry(nanoTime)
}
Expand All @@ -124,11 +124,11 @@ private[mill] class MultiLogger(
logger2.debug(s)
}

private[mill] override def logKey = logger1.logKey ++ logger2.logKey
override def logKey = logger1.logKey ++ logger2.logKey

private[mill] override def message = logger1.message ++ logger2.message
override def message = logger1.message ++ logger2.message

private[mill] override def keySuffix = logger1.keySuffix ++ logger2.keySuffix
override def keySuffix = logger1.keySuffix ++ logger2.keySuffix

override def redirectOutToErr: Boolean = logger1.redirectOutToErr || logger1.redirectOutToErr
override def withRedirectOutToErr() = new MultiLogger(
Expand Down
2 changes: 1 addition & 1 deletion core/internal/src/mill/internal/MultiStream.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package mill.internal
import java.io.{OutputStream, PrintStream}
private[mill] class MultiStream(stream1: OutputStream, stream2: OutputStream)
class MultiStream(stream1: OutputStream, stream2: OutputStream)
extends PrintStream(new OutputStream {
def write(b: Int): Unit = {
stream1.write(b)
Expand Down
2 changes: 1 addition & 1 deletion core/internal/src/mill/internal/PipeStreams.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import java.io.{IOException, InputStream, OutputStream}
* somewhat cleaned up as a single object rather than two loose objects you have
* to connect together.
*/
private[mill] class PipeStreams(val bufferSize: Int = 1024) { pipe =>
class PipeStreams(val bufferSize: Int = 1024) { pipe =>

private var closedByWriter = false
@volatile private var closedByReader = false
Expand Down
6 changes: 3 additions & 3 deletions core/internal/src/mill/internal/PrefixLogger.scala
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import java.io.PrintStream
*
* [$parentKeys-$key0] $message
*/
private[mill] case class PrefixLogger(
case class PrefixLogger(
logger0: Logger,
key0: Seq[String],
override val keySuffix: String = "",
Expand All @@ -34,7 +34,7 @@ private[mill] case class PrefixLogger(
case None => logger0.redirectOutToErr
case Some(b) => b
}
private[mill] override val logKey = logger0.logKey ++ key0
override val logKey = logger0.logKey ++ key0

assert(key0.forall(_.nonEmpty))
val linePrefix: String = Logger.formatPrefix(
Expand All @@ -55,7 +55,7 @@ private[mill] case class PrefixLogger(
logger0.streams.in
)

private[mill] override val unprefixedStreams = new SystemStreams(
override val unprefixedStreams = new SystemStreams(
if (redirectOutToErr) logger0.unprefixedStreams.err else logger0.unprefixedStreams.out,
logger0.unprefixedStreams.err,
logger0.unprefixedStreams.in
Expand Down
16 changes: 8 additions & 8 deletions core/internal/src/mill/internal/PromptLogger.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import java.io.*
* [[streams]] are *not* synchronized, and instead goes into a [[PipeStreams]]
* buffer to be read out and handled asynchronously.
*/
private[mill] class PromptLogger(
class PromptLogger(
colored: Boolean,
enableTicker: Boolean,
infoColor: fansi.Attrs,
Expand Down Expand Up @@ -104,15 +104,15 @@ private[mill] class PromptLogger(

object prompt extends Logger.Prompt {

private[mill] def beginChromeProfileEntry(text: String): Unit = {
def beginChromeProfileEntry(text: String): Unit = {
logBeginChromeProfileEntry(text, System.nanoTime())
}

private[mill] def endChromeProfileEntry(): Unit = {
def endChromeProfileEntry(): Unit = {
logEndChromeProfileEntry(System.nanoTime())
}

override private[mill] def logBeginChromeProfileEntry(message: String, nanoTime: Long) = {
override def logBeginChromeProfileEntry(message: String, nanoTime: Long) = {
chromeProfileLogger.logBegin(
message,
"job",
Expand All @@ -121,7 +121,7 @@ private[mill] class PromptLogger(
)
}

override private[mill] def logEndChromeProfileEntry(nanoTime: Long) = {
override def logEndChromeProfileEntry(nanoTime: Long) = {
chromeProfileLogger.logEnd(
nanoTime / 1000,
threadNumberer.getThreadId(Thread.currentThread())
Expand Down Expand Up @@ -259,10 +259,10 @@ private[mill] class PromptLogger(
seenIdentifiers(key) = (keySuffix, message)
}

private[mill] override def withPromptPaused[T](t: => T): T =
override def withPromptPaused[T](t: => T): T =
runningState.withPromptPaused0(true, t)

private[mill] override def withPromptUnpaused[T](t: => T): T =
override def withPromptUnpaused[T](t: => T): T =
runningState.withPromptPaused0(false, t)

def enableTicker = PromptLogger.this.enableTicker
Expand Down Expand Up @@ -303,7 +303,7 @@ private[mill] class PromptLogger(
def streams = streamManager.proxySystemStreams
}

private[mill] object PromptLogger {
object PromptLogger {

/**
* Manages the paused/unpaused/stopped state of the prompt logger. Encapsulate in a separate
Expand Down
Loading
Loading