summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/src/mill/eval/Evaluator.scala9
-rw-r--r--core/src/mill/util/Ctx.scala14
-rw-r--r--scalalib/src/mill/scalalib/GenIdea.scala4
3 files changed, 6 insertions, 21 deletions
diff --git a/core/src/mill/eval/Evaluator.scala b/core/src/mill/eval/Evaluator.scala
index cdb17223..f1a34e69 100644
--- a/core/src/mill/eval/Evaluator.scala
+++ b/core/src/mill/eval/Evaluator.scala
@@ -6,7 +6,6 @@ import ammonite.ops._
import ammonite.runtime.SpecialClassLoader
import mill.define.{Ctx => _, _}
import mill.util
-import mill.util.Ctx.Loader
import mill.util._
import mill.util.Strict.Agg
@@ -24,9 +23,6 @@ case class Labelled[T](target: NamedTask[T],
case _ => None
}
}
-object RootModuleLoader extends Loader[mill.Module] {
- def make() = ???
-}
class Evaluator[T](val workspacePath: Path,
val basePath: Path,
val rootModule: mill.Module,
@@ -225,10 +221,7 @@ class Evaluator[T](val workspacePath: Path,
targetInputValues.toArray[Any],
paths.map(_.dest).orNull,
groupBasePath.orNull,
- multiLogger,
- new Ctx.LoaderCtx{
- def load[T](x: Ctx.Loader[T]): T = ???
- }
+ multiLogger
)
val out = System.out
diff --git a/core/src/mill/util/Ctx.scala b/core/src/mill/util/Ctx.scala
index 60e6bdbf..9f8d2826 100644
--- a/core/src/mill/util/Ctx.scala
+++ b/core/src/mill/util/Ctx.scala
@@ -2,7 +2,7 @@ package mill.util
import ammonite.ops.Path
import mill.define.Applicative.ImplicitStub
-import mill.util.Ctx.{ArgCtx, BaseCtx, DestCtx, LoaderCtx, LogCtx}
+import mill.util.Ctx.{ArgCtx, BaseCtx, DestCtx, LogCtx}
import scala.annotation.compileTimeOnly
import scala.language.implicitConversions
@@ -33,25 +33,17 @@ object Ctx{
trait ArgCtx{
def args: IndexedSeq[_]
}
- trait LoaderCtx{
- def load[T](x: Loader[T]): T
- }
- trait Loader[T]{
- def make(): T
- }
+
}
class Ctx(val args: IndexedSeq[_],
val dest: Path,
val base: Path,
- val log: Logger,
- workerCtx0: Ctx.LoaderCtx)
+ val log: Logger)
extends DestCtx
with LogCtx
with ArgCtx
- with LoaderCtx
with BaseCtx{
- def load[T](x: Ctx.Loader[T]): T = workerCtx0.load(x)
def length = args.length
def apply[T](index: Int): T = {
if (index >= 0 && index < args.length) args(index).asInstanceOf[T]
diff --git a/scalalib/src/mill/scalalib/GenIdea.scala b/scalalib/src/mill/scalalib/GenIdea.scala
index 0f084b2d..927c39d7 100644
--- a/scalalib/src/mill/scalalib/GenIdea.scala
+++ b/scalalib/src/mill/scalalib/GenIdea.scala
@@ -2,9 +2,9 @@ package mill.scalalib
import ammonite.ops._
import mill.define.{BaseModule, Segment, Segments, Target}
-import mill.eval.{Evaluator, PathRef, RootModuleLoader}
+import mill.eval.{Evaluator, PathRef}
import mill.scalalib
-import mill.util.Ctx.{LoaderCtx, LogCtx}
+import mill.util.Ctx.LogCtx
import mill.util.{Loose, PrintLogger, Strict}
import mill.util.Strict.Agg