Skip to content

Commit b6d5864

Browse files
lihaoyilihaoyi
committed
wip
1 parent dd3a69b commit b6d5864

File tree

28 files changed

+146
-76
lines changed

28 files changed

+146
-76
lines changed

Diff for: ‎contrib/gitlab/src/mill/contrib/gitlab/GitlabTokenLookup.scala

+6-2
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,18 @@ trait GitlabTokenLookup {
5858
): Result[GitlabAuthHeaders] = {
5959

6060
def readPath(path: os.Path): Result[String] =
61-
Result.fromEither(Try(os.read(path)).map(_.trim).toEither.left.map(e => s"failed to read file $e"))
61+
Result.fromEither(Try(os.read(path)).map(_.trim).toEither.left.map(e =>
62+
s"failed to read file $e"
63+
))
6264

6365
def readSource(source: TokenSource): Result[String] =
6466
source match {
6567
case Env(name) =>
6668
Result.fromEither(env.get(name).toRight(s"Could not read environment variable $name"))
6769
case Property(property) =>
68-
Result.fromEither(prop.get(property).toRight(s"Could not read system property variable $prop"))
70+
Result.fromEither(
71+
prop.get(property).toRight(s"Could not read system property variable $prop")
72+
)
6973
case File(path) =>
7074
readPath(path)
7175
case WorkspaceFile(path) =>

Diff for: ‎contrib/scoverage/test/src/mill/contrib/scoverage/HelloWorldTests.scala

+4-2
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,8 @@ trait FailedWorldTests extends HelloWorldTests {
283283
assert(msg == errorMsg)
284284
}
285285
test("other") - UnitTester(mod, resourcePath).scoped { eval =>
286-
val Left(ExecResult.Failure(msg, _)) = eval.apply(mod.core.scoverage.xmlReport()): @unchecked
286+
val Left(ExecResult.Failure(msg, _)) =
287+
eval.apply(mod.core.scoverage.xmlReport()): @unchecked
287288
assert(msg == errorMsg)
288289
}
289290
}
@@ -299,7 +300,8 @@ trait FailedWorldTests extends HelloWorldTests {
299300
assert(msg == errorMsg)
300301
}
301302
test("other") - UnitTester(mod, resourcePath).scoped { eval =>
302-
val Left(ExecResult.Failure(msg, _)) = eval.apply(mod.core.scoverage.xmlReport()): @unchecked
303+
val Left(ExecResult.Failure(msg, _)) =
304+
eval.apply(mod.core.scoverage.xmlReport()): @unchecked
303305
assert(msg == errorMsg)
304306
}
305307
}

Diff for: ‎core/api/src/mill/api/ExecResult.scala

+2-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ object ExecResult {
127127
catch {
128128
case e: InvocationTargetException =>
129129
mill.api.Result.Failure(makeResultException(e.getCause, new java.lang.Exception()).left.get)
130-
case e: Exception => mill.api.Result.Failure(makeResultException(e, new java.lang.Exception()).left.get)
130+
case e: Exception =>
131+
mill.api.Result.Failure(makeResultException(e, new java.lang.Exception()).left.get)
131132
}
132133
}
133134

Diff for: ‎core/api/src/mill/api/Result.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ sealed trait Result[+T] {
1313
}
1414
object Result {
1515
implicit def create[T](value: T): Result[T] = Success(value)
16-
case class Success[+T](value: T) extends Result[T]{
16+
case class Success[+T](value: T) extends Result[T] {
1717

1818
def map[V](f: T => V): Result[V] = Success(f(value))
1919

@@ -32,15 +32,15 @@ object Result {
3232
def toEither: Either[String, Nothing] = Left(error)
3333
def left: Option[String] = Some(error)
3434
}
35-
36-
def fromEither[T](either: Either[String, T]) = either match{
35+
36+
def fromEither[T](either: Either[String, T]) = either match {
3737
case Left(err) => Result.Failure(err)
3838
case Right(value) => Result.Success(value)
3939
}
4040

4141
// implementation similar to scala.concurrent.Future#sequence
4242
def sequence[B, M[X] <: IterableOnce[X]](in: M[Result[B]])(
43-
implicit cbf: BuildFrom[M[Result[B]], B, M[B]]
43+
implicit cbf: BuildFrom[M[Result[B]], B, M[B]]
4444
): Result[M[B]] = {
4545
in.iterator
4646
.foldLeft[Result[mutable.Builder[B, M[B]]]](Success(cbf.newBuilder(in))) {

Diff for: ‎core/exec/src/mill/exec/GroupExecution.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ private[mill] trait GroupExecution {
266266
case Result.Success(v) => ExecResult.Success(Val(v))
267267
case Result.Failure(err) => ExecResult.Failure(err)
268268
}
269-
}catch {
269+
} catch {
270270
case f: ExecResult.Failing[Val] @unchecked => f
271271
case NonFatal(e) =>
272272
ExecResult.Exception(

Diff for: ‎core/exec/src/mill/exec/TaskResult.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package mill.exec
22

3-
import mill.api.{ExecResult, Result}
3+
import mill.api.ExecResult
44

55
case class TaskResult[T](result: ExecResult[T], recalc: () => ExecResult[T]) {
66
def map[V](f: T => V): TaskResult[V] = TaskResult[V](

Diff for: ‎core/resolve/src/mill/resolve/ParseArgs.scala

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import mill.api.Result
44
import fastparse.NoWhitespace.noWhitespaceImplicit
55
import fastparse._
66
import mill.define.{Segment, Segments, SelectMode}
7-
import mill.internal.EitherOps
87

98
import scala.annotation.tailrec
109

Diff for: ‎core/resolve/src/mill/resolve/Resolve.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import mill.define.{
1414
SelectMode
1515
}
1616
import mill.api.Result
17-
import mill.internal.EitherOps
1817
import mill.resolve.ResolveCore.{Resolved, makeResultException}
1918

2019
private[mill] object Resolve {
@@ -198,7 +197,8 @@ private[mill] object Resolve {
198197
)
199198
} match {
200199
case mainargs.Result.Success(v: Command[_]) => Result.Success(v)
201-
case mainargs.Result.Failure.Exception(e) => Result.Failure(makeResultException(e, new Exception()).left.get)
200+
case mainargs.Result.Failure.Exception(e) =>
201+
Result.Failure(makeResultException(e, new Exception()).left.get)
202202
case f: mainargs.Result.Failure =>
203203
Result.Failure(
204204
mainargs.Renderer.renderResult(

Diff for: ‎core/resolve/src/mill/resolve/ResolveCore.scala

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package mill.resolve
22

33
import mill.define.*
44
import mill.define.internal.Reflect
5-
import mill.internal.EitherOps
65

76
import java.lang.reflect.InvocationTargetException
87
import java.lang.reflect.Method
@@ -80,7 +79,8 @@ private object ResolveCore {
8079
catch {
8180
case e: InvocationTargetException =>
8281
mill.api.Result.Failure(makeResultException(e.getCause, new java.lang.Exception()).left.get)
83-
case e: Exception => mill.api.Result.Failure(makeResultException(e, new java.lang.Exception()).left.get)
82+
case e: Exception =>
83+
mill.api.Result.Failure(makeResultException(e, new java.lang.Exception()).left.get)
8484
}
8585
}
8686

@@ -412,7 +412,8 @@ private object ResolveCore {
412412
): mill.api.Result[Seq[(Resolved, Option[Module => mill.api.Result[Module]])]] = {
413413
def namePred(n: String) = nameOpt.isEmpty || nameOpt.contains(n)
414414

415-
val modulesOrErr: mill.api.Result[Seq[(Resolved, Option[Module => mill.api.Result[Module]])]] = {
415+
val modulesOrErr
416+
: mill.api.Result[Seq[(Resolved, Option[Module => mill.api.Result[Module]])]] = {
416417
if (classOf[DynamicModule].isAssignableFrom(cls)) {
417418
instantiateModule(rootModule, segments, cache).map {
418419
case m: DynamicModule =>

Diff for: ‎core/resolve/test/src/mill/resolve/ErrorTests.scala

+12-2
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,12 @@ object ErrorTests extends TestSuite {
346346
test - check.checkSeq0(
347347
Seq("myCross._.foo"),
348348
isShortError(_, "MyCross Boom"),
349-
_ == Result.Success(List("myCross[1].foo", "myCross[2].foo", "myCross[3].foo", "myCross[4].foo"))
349+
_ == Result.Success(List(
350+
"myCross[1].foo",
351+
"myCross[2].foo",
352+
"myCross[3].foo",
353+
"myCross[4].foo"
354+
))
350355
)
351356
test - check.checkSeq0(
352357
Seq("myCross[_].foo"),
@@ -356,7 +361,12 @@ object ErrorTests extends TestSuite {
356361
test - check.checkSeq0(
357362
Seq("__.foo"),
358363
isShortError(_, "MyCross Boom"),
359-
_ == Result.Success(List("myCross[1].foo", "myCross[2].foo", "myCross[3].foo", "myCross[4].foo"))
364+
_ == Result.Success(List(
365+
"myCross[1].foo",
366+
"myCross[2].foo",
367+
"myCross[3].foo",
368+
"myCross[4].foo"
369+
))
360370
)
361371
test - check.checkSeq0(
362372
Seq("__"),

Diff for: ‎core/resolve/test/src/mill/resolve/ModuleTests.scala

+3-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,9 @@ object ModuleTests extends TestSuite {
262262
)
263263
test("labelNeg3") - check(
264264
"__.doesntExist",
265-
Result.Failure("Cannot resolve __.doesntExist. Try `mill resolve _` to see what's available.")
265+
Result.Failure(
266+
"Cannot resolve __.doesntExist. Try `mill resolve _` to see what's available."
267+
)
266268
)
267269
test("labelNeg4") - check(
268270
"cross.__.doesntExist",

Diff for: ‎core/resolve/test/src/mill/resolve/ResolveTests.scala

+45-12
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ object ResolveTests extends TestSuite {
3636
test("wildcard") - check("_", Result.Success(Set(_.single)), Set("single"))
3737
test("neg1") - check("sngle", Result.Failure("Cannot resolve sngle. Did you mean single?"))
3838
test("neg2") - check("snigle", Result.Failure("Cannot resolve snigle. Did you mean single?"))
39-
test("neg3") - check("nsiigle", Result.Failure("Cannot resolve nsiigle. Did you mean single?"))
39+
test("neg3") - check(
40+
"nsiigle",
41+
Result.Failure("Cannot resolve nsiigle. Did you mean single?")
42+
)
4043
test("neg4") - check(
4144
"ansiigle",
4245
Result.Failure("Cannot resolve ansiigle. Try `mill resolve _` to see what's available.")
@@ -47,26 +50,44 @@ object ResolveTests extends TestSuite {
4750
)
4851
test("neg6") - check(
4952
"single.doesntExist",
50-
Result.Failure("Cannot resolve single.doesntExist. single resolves to a Task with no children.")
53+
Result.Failure(
54+
"Cannot resolve single.doesntExist. single resolves to a Task with no children."
55+
)
5156
)
5257
test("neg7") - check(
5358
"",
54-
Result.Failure("Target selector must not be empty. Try `mill resolve _` to see what's available.")
59+
Result.Failure(
60+
"Target selector must not be empty. Try `mill resolve _` to see what's available."
61+
)
5562
)
5663
}
5764
test("backtickIdentifiers") {
5865
val check = new Checker(bactickIdentifiers)
5966
test("pos1") - check("up-target", Result.Success(Set(_.`up-target`)), Set("up-target"))
60-
test("pos2") - check("a-down-target", Result.Success(Set(_.`a-down-target`)), Set("a-down-target"))
61-
test("neg1") - check("uptarget", Result.Failure("Cannot resolve uptarget. Did you mean up-target?"))
62-
test("neg2") - check("upt-arget", Result.Failure("Cannot resolve upt-arget. Did you mean up-target?"))
67+
test("pos2") - check(
68+
"a-down-target",
69+
Result.Success(Set(_.`a-down-target`)),
70+
Set("a-down-target")
71+
)
72+
test("neg1") - check(
73+
"uptarget",
74+
Result.Failure("Cannot resolve uptarget. Did you mean up-target?")
75+
)
76+
test("neg2") - check(
77+
"upt-arget",
78+
Result.Failure("Cannot resolve upt-arget. Did you mean up-target?")
79+
)
6380
test("neg3") - check(
6481
"up-target.doesntExist",
65-
Result.Failure("Cannot resolve up-target.doesntExist. up-target resolves to a Task with no children.")
82+
Result.Failure(
83+
"Cannot resolve up-target.doesntExist. up-target resolves to a Task with no children."
84+
)
6685
)
6786
test("neg4") - check(
6887
"",
69-
Result.Failure("Target selector must not be empty. Try `mill resolve _` to see what's available.")
88+
Result.Failure(
89+
"Target selector must not be empty. Try `mill resolve _` to see what's available."
90+
)
7091
)
7192
test("neg5") - check(
7293
"invisible",
@@ -93,7 +114,11 @@ object ResolveTests extends TestSuite {
93114
test("nested") {
94115
val check = new Checker(nestedModule)
95116
test("pos1") - check("single", Result.Success(Set(_.single)), Set("single"))
96-
test("pos2") - check("nested.single", Result.Success(Set(_.nested.single)), Set("nested.single"))
117+
test("pos2") - check(
118+
"nested.single",
119+
Result.Success(Set(_.nested.single)),
120+
Set("nested.single")
121+
)
97122
test("pos3") - check(
98123
"classInstance.single",
99124
Result.Success(Set(_.classInstance.single)),
@@ -125,7 +150,9 @@ object ResolveTests extends TestSuite {
125150
)
126151
test("neg2") - check(
127152
"single.doesntExist",
128-
Result.Failure("Cannot resolve single.doesntExist. single resolves to a Task with no children.")
153+
Result.Failure(
154+
"Cannot resolve single.doesntExist. single resolves to a Task with no children."
155+
)
129156
)
130157
test("neg3") - check(
131158
"nested.doesntExist",
@@ -163,7 +190,9 @@ object ResolveTests extends TestSuite {
163190
)
164191
test("wildcardNeg3") - check(
165192
"nested._.foobar",
166-
Result.Failure("Cannot resolve nested._.foobar. nested._ resolves to a Task with no children.")
193+
Result.Failure(
194+
"Cannot resolve nested._.foobar. nested._ resolves to a Task with no children."
195+
)
167196
)
168197
test("wildcard2") - check(
169198
"__.single",
@@ -187,7 +216,11 @@ object ResolveTests extends TestSuite {
187216
test("doubleNested") {
188217
val check = new Checker(doubleNestedModule)
189218
test("pos1") - check("single", Result.Success(Set(_.single)), Set("single"))
190-
test("pos2") - check("nested.single", Result.Success(Set(_.nested.single)), Set("nested.single"))
219+
test("pos2") - check(
220+
"nested.single",
221+
Result.Success(Set(_.nested.single)),
222+
Set("nested.single")
223+
)
191224
test("pos3") - check(
192225
"nested.inner.single",
193226
Result.Success(Set(_.nested.inner.single)),

Diff for: ‎core/src/mill/eval/Evaluator.scala

+11-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,17 @@ package mill.eval
33
import mill.api.{ColorLogger, ExecResult, PathRef, Result, SystemStreams, Val}
44
import mill.client.OutFiles
55
import mill.define.*
6-
import mill.exec.{Cached, ChromeProfileLogger, ExecResults, ExecutionCore, ExecutionPaths, ExecutionPathsResolver, Plan, ProfileLogger, TaskResult}
6+
import mill.exec.{
7+
Cached,
8+
ChromeProfileLogger,
9+
ExecResults,
10+
ExecutionCore,
11+
ExecutionPaths,
12+
ExecutionPathsResolver,
13+
Plan,
14+
ProfileLogger,
15+
TaskResult
16+
}
717
import mill.define.Watchable
818
import OutFiles.*
919
import mill.resolve.Resolve

0 commit comments

Comments
 (0)