Skip to content

Commit c0279df

Browse files
lihaoyiautofix-ci[bot]
lihaoyi
and
autofix-ci[bot]
authored
Task.Cached -> Task.Simple (#5170)
Forgot to commit this in #5168 --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
1 parent 76a5831 commit c0279df

File tree

11 files changed

+43
-43
lines changed

11 files changed

+43
-43
lines changed

‎core/define/src/mill/define/Discover.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ object Discover {
128128
curCls,
129129
declMethods,
130130
(TypeRepr.of[Task.Command[?]], 1, "`Task.Command`"),
131-
(TypeRepr.of[Task.Cached[?]], 0, "Target")
131+
(TypeRepr.of[Task.Simple[?]], 0, "Target")
132132
)
133133

134134
val names =

‎core/define/src/mill/define/Module.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package mill.define
33
import mill.api
44
import mill.api.internal.{ModuleApi, internal}
55
import mill.define.internal.{OverrideMapping, Reflect}
6-
import mill.define.Task.Cached
6+
import mill.define.Task.Simple
77

88
import scala.reflect.ClassTag
99

@@ -71,8 +71,8 @@ object Module {
7171
lazy val segmentsToModules: Map[Segments, Module] =
7272
modules.map(m => (m.moduleSegments, m)).toMap
7373

74-
lazy val targets: Set[Cached[?]] =
75-
traverse { _.moduleInternal.reflectAll[Cached[?]].toIndexedSeq }.toSet
74+
lazy val targets: Set[Simple[?]] =
75+
traverse { _.moduleInternal.reflectAll[Simple[?]].toIndexedSeq }.toSet
7676

7777
def reflect[T: ClassTag](filter: String => Boolean): Seq[T] = {
7878
Reflect.reflect(

‎core/define/src/mill/define/Task.scala‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ sealed abstract class Task[+T] extends Task.Ops[T] with Applyable[Task, T] with
4242
*/
4343
def persistent: Boolean = false
4444

45-
def asTarget: Option[Task.Cached[T]] = None
45+
def asTarget: Option[Task.Simple[T]] = None
4646
def asCommand: Option[Task.Command[T]] = None
4747
def asWorker: Option[Task.Worker[T]] = None
4848
def isExclusiveCommand: Boolean = this match {
@@ -150,14 +150,14 @@ object Task {
150150
*/
151151
inline def Sources(inline values: Result[os.Path]*)(implicit
152152
inline ctx: mill.define.ModuleCtx
153-
): Cached[Seq[PathRef]] = ${
153+
): Simple[Seq[PathRef]] = ${
154154
Macros.sourcesImpl('{ Result.sequence(values.map(_.map(PathRef(_)))) })('ctx)
155155
}
156156

157157
inline def Sources(inline values: os.SubPath*)(implicit
158158
inline ctx: mill.define.ModuleCtx,
159159
dummy: Boolean = true
160-
): Cached[Seq[PathRef]] = ${
160+
): Simple[Seq[PathRef]] = ${
161161
Macros.sourcesImpl(
162162
'{ values.map(sub => PathRef(ctx.millSourcePath / os.up / os.PathChunk.SubPathChunk(sub))) }
163163
)('ctx)
@@ -169,12 +169,12 @@ object Task {
169169
*/
170170
inline def Source(inline value: Result[os.Path])(implicit
171171
inline ctx: mill.define.ModuleCtx
172-
): Cached[PathRef] =
172+
): Simple[PathRef] =
173173
${ Macros.sourceImpl('{ value.map(PathRef(_)) })('ctx) }
174174

175175
inline def Source(inline value: os.SubPath)(implicit
176176
inline ctx: mill.define.ModuleCtx
177-
): Cached[PathRef] =
177+
): Simple[PathRef] =
178178
${ Macros.sourceImpl('{ PathRef(ctx.millSourcePath / os.up / value) })('ctx) }
179179

180180
/**
@@ -196,7 +196,7 @@ object Task {
196196
inline def Input[T](inline value: Result[T])(implicit
197197
inline w: Writer[T],
198198
inline ctx: ModuleCtx
199-
): Cached[T] =
199+
): Simple[T] =
200200
${ Macros.inputImpl[T]('value)('w, 'ctx) }
201201

202202
/**
@@ -266,7 +266,7 @@ object Task {
266266
inline def apply[T](inline t: Result[T])(implicit
267267
inline rw: ReadWriter[T],
268268
inline ctx: mill.define.ModuleCtx
269-
): Cached[T] =
269+
): Simple[T] =
270270
${ Macros.targetResultImpl[T]('t)('rw, 'ctx, '{ false }) }
271271

272272
/**
@@ -290,7 +290,7 @@ object Task {
290290
inline def apply[T](inline t: Result[T])(implicit
291291
inline rw: ReadWriter[T],
292292
inline ctx: ModuleCtx
293-
): Cached[T] = ${ Macros.targetResultImpl[T]('t)('rw, 'ctx, '{ persistent }) }
293+
): Simple[T] = ${ Macros.targetResultImpl[T]('t)('rw, 'ctx, '{ persistent }) }
294294
}
295295

296296
abstract class Ops[+T] { this: Task[T] =>
@@ -357,8 +357,8 @@ object Task {
357357
val readWriter: ReadWriter[?],
358358
val isPrivate: Option[Boolean],
359359
override val persistent: Boolean
360-
) extends Cached[T] {
361-
override def asTarget: Option[Cached[T]] = Some(this)
360+
) extends Simple[T] {
361+
override def asTarget: Option[Simple[T]] = Some(this)
362362

363363
// FIXME: deprecated return type: Change to Option
364364
override def readWriterOpt: Some[ReadWriter[?]] = Some(readWriter)
@@ -368,9 +368,9 @@ object Task {
368368
* A Target is a [[Task.Named]] that is cached on disk; either a
369369
* [[Task.Computed]] or an [[Input]]
370370
*/
371-
trait Cached[+T] extends Task.Named[T]
371+
trait Simple[+T] extends Task.Named[T]
372372

373-
object Cached {
373+
object Simple {
374374

375375
/**
376376
* A target is the most common [[Task]] a user would encounter, commonly
@@ -381,13 +381,13 @@ object Task {
381381
implicit inline def create[T](inline t: T)(implicit
382382
inline rw: ReadWriter[T],
383383
inline ctx: ModuleCtx
384-
): Cached[T] =
384+
): Simple[T] =
385385
${ Macros.targetResultImpl[T]('{ Result.Success(t) })('rw, 'ctx, '{ false }) }
386386

387387
implicit inline def create[T](inline t: Result[T])(implicit
388388
inline rw: ReadWriter[T],
389389
inline ctx: ModuleCtx
390-
): Cached[T] =
390+
): Simple[T] =
391391
${ Macros.targetResultImpl[T]('t)('rw, 'ctx, '{ false }) }
392392

393393
}
@@ -433,7 +433,7 @@ object Task {
433433
val ctx0: mill.define.ModuleCtx,
434434
val writer: upickle.default.Writer[?],
435435
val isPrivate: Option[Boolean]
436-
) extends Cached[T] {
436+
) extends Simple[T] {
437437
val inputs = Nil
438438
override def sideHash: Int = util.Random.nextInt()
439439
// FIXME: deprecated return type: Change to Option
@@ -495,8 +495,8 @@ object Task {
495495
rw: Expr[ReadWriter[T]],
496496
ctx: Expr[mill.define.ModuleCtx],
497497
persistent: Expr[Boolean]
498-
): Expr[Cached[T]] = {
499-
val expr = appImpl[Cached, T](
498+
): Expr[Simple[T]] = {
499+
val expr = appImpl[Simple, T](
500500
(in, ev) =>
501501
'{ new Task.Computed[T]($in, $ev, $ctx, $rw, ${ taskIsPrivate() }, $persistent) },
502502
t
@@ -511,8 +511,8 @@ object Task {
511511
values: Expr[Result[Seq[PathRef]]]
512512
)(
513513
ctx: Expr[mill.define.ModuleCtx]
514-
): Expr[Cached[Seq[PathRef]]] = {
515-
val expr = appImpl[Cached, Seq[PathRef]](
514+
): Expr[Simple[Seq[PathRef]]] = {
515+
val expr = appImpl[Simple, Seq[PathRef]](
516516
(in, ev) => '{ new Sources($ev, $ctx, ${ taskIsPrivate() }) },
517517
values,
518518
allowTaskReferences = false
@@ -524,9 +524,9 @@ object Task {
524524
Quotes
525525
)(value: Expr[Result[PathRef]])(
526526
ctx: Expr[mill.define.ModuleCtx]
527-
): Expr[Cached[PathRef]] = {
527+
): Expr[Simple[PathRef]] = {
528528

529-
val expr = appImpl[Cached, PathRef](
529+
val expr = appImpl[Simple, PathRef](
530530
(in, ev) => '{ new Source($ev, $ctx, ${ taskIsPrivate() }) },
531531
value,
532532
allowTaskReferences = false
@@ -540,9 +540,9 @@ object Task {
540540
)(value: Expr[Result[T]])(
541541
w: Expr[upickle.default.Writer[T]],
542542
ctx: Expr[mill.define.ModuleCtx]
543-
): Expr[Cached[T]] = {
543+
): Expr[Simple[T]] = {
544544

545-
val expr = appImpl[Cached, T](
545+
val expr = appImpl[Simple, T](
546546
(in, ev) => '{ new Input[T]($ev, $ctx, $w, ${ taskIsPrivate() }) },
547547
value,
548548
allowTaskReferences = false

‎core/define/test/src/mill/define/DiscoverTests.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package mill.define
22

33
import mill.util.TestGraphs
4-
import Task.Cached
4+
import Task.Simple
55
import utest._
66

77
object DiscoverTests extends TestSuite {
88
val tests = Tests {
9-
def check[T <: Module](m: T)(targets: (T => Cached[?])*) = {
9+
def check[T <: Module](m: T)(targets: (T => Simple[?])*) = {
1010
val discovered = m.moduleInternal.targets
1111
val expected = targets.map(_(m)).toSet
1212
assert(discovered == expected)

‎core/exec/test/src/mill/exec/PlanTests.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package mill.exec
22

33
import mill.define.Task
4-
import mill.define.Task.Cached
4+
import mill.define.Task.Simple
55
import mill.util.TestGraphs
66
import utest.*
77

@@ -60,17 +60,17 @@ object PlanTests extends TestSuite {
6060
)
6161
}
6262
test("groupAroundNamedTargets") {
63-
def check[T, R <: Cached[Int]](base: T)(
63+
def check[T, R <: Simple[Int]](base: T)(
6464
target: T => R,
65-
important0: Seq[T => Cached[?]],
65+
important0: Seq[T => Simple[?]],
6666
expected: Seq[(R, Int)]
6767
) = {
6868

6969
val topoSorted = PlanImpl.topoSorted(PlanImpl.transitiveTargets(Seq(target(base))))
7070

7171
val important = important0.map(_(base))
7272
val grouped = PlanImpl.groupAroundImportantTargets(topoSorted) {
73-
case t: Task.Computed[_] if important.contains(t) => t: Cached[?]
73+
case t: Task.Computed[_] if important.contains(t) => t: Simple[?]
7474
}
7575
val flattened = Seq.from(grouped.values().flatten)
7676

@@ -79,7 +79,7 @@ object PlanTests extends TestSuite {
7979
val grouping = grouped.lookupKey(terminal)
8080
assert(
8181
grouping.size == expectedSize,
82-
grouping.flatMap(_.asTarget: Option[Cached[?]]).filter(important.contains) == Seq(
82+
grouping.flatMap(_.asTarget: Option[Simple[?]]).filter(important.contains) == Seq(
8383
terminal
8484
)
8585
)

‎core/util/src/mill/mill.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package object mill extends mill.define.JsonFormatters with mill.util.TokenReaders0 {
2-
type T[+T] = define.Task.Cached[T]
3-
type Target[+T] = define.Task.Cached[T]
2+
type T[+T] = define.Task.Simple[T]
3+
type Target[+T] = define.Task.Simple[T]
44
val PathRef = mill.define.PathRef
55
type PathRef = mill.define.PathRef
66
type Module = define.Module
@@ -19,8 +19,8 @@ package object mill extends mill.define.JsonFormatters with mill.util.TokenReade
1919

2020
type Command[+T] = define.Task.Command[T]
2121
type Worker[+T] = define.Task.Worker[T]
22-
type Source = define.Task.Cached[PathRef]
23-
type Sources = define.Task.Cached[Seq[PathRef]]
22+
type Source = define.Task.Simple[PathRef]
23+
type Sources = define.Task.Simple[Seq[PathRef]]
2424

2525
type TaskModule = define.TaskModule
2626
}

‎libs/main/src/mill/main/Inspect.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ private object Inspect {
6363
def rec(t: Task[?]): Seq[Segments] = {
6464
if (seen(t)) Nil // do nothing
6565
else t match {
66-
case t: mill.define.Task.Cached[_]
66+
case t: mill.define.Task.Simple[_]
6767
if evaluator.rootModule.moduleInternal.targets.contains(t) =>
6868
Seq(t.ctx.segments)
6969
case _ =>

‎libs/scalajslib/test/src/mill/scalajslib/EsModuleRemapTests.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import mill.define.Discover
55
import mill.testkit.UnitTester
66
import mill.testkit.TestRootModule
77
import utest._
8-
import mill.define.Task.Cached
8+
import mill.define.Task.Simple
99
import mill.T
1010
import mill.scalajslib.api._
1111

‎libs/scalalib/src/mill/scalalib/AssemblyModule.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import mill.define.PathRef
44
import mill.api.Result
55
import mill.util.JarManifest
66
import mill.define.*
7-
import mill.define.Task.Cached as T
7+
import mill.define.Task.Simple as T
88
import mill.scalalib.Assembly.UnopenedInputStream
99
import mill.util.Jvm
1010

‎libs/scalalib/test/src/mill/scalalib/LauncherTests.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object LauncherTests extends TestSuite {
2121
val resourcePath = os.Path(sys.env("MILL_TEST_RESOURCE_DIR")) / "launcher"
2222

2323
def tests: Tests = Tests {
24-
def check(executableTask: mill.define.Task.Cached[PathRef], copyBat: Boolean = false) = {
24+
def check(executableTask: mill.define.Task.Simple[PathRef], copyBat: Boolean = false) = {
2525
UnitTester(HelloJava, resourcePath).scoped { eval =>
2626

2727
val Right(result1) = eval.apply(executableTask): @unchecked

0 commit comments

Comments
 (0)