Skip to content

Commit e69f1bd

Browse files
committed
syntax fix after rebase
1 parent ab87d07 commit e69f1bd

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

main/eval/src/mill/eval/EvaluatorCore.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,10 +224,10 @@ private[mill] trait EvaluatorCore extends GroupEvaluator {
224224
c.getInterfaces.iterator.flatMap(resolveTransitiveParents)
225225
}
226226

227-
val classToTransitiveClasses = sortedGroups
227+
val classToTransitiveClasses: Map[Class[?], IndexedSeq[Class[?]]] = sortedGroups
228228
.values()
229229
.flatten
230-
.collect { case namedTask: NamedTask[_] => namedTask.ctx.enclosingCls }
230+
.collect { case namedTask: NamedTask[?] => namedTask.ctx.enclosingCls }
231231
.map(cls => cls -> resolveTransitiveParents(cls).toVector)
232232
.toMap
233233

@@ -236,7 +236,7 @@ private[mill] trait EvaluatorCore extends GroupEvaluator {
236236
.flatMap(_._2)
237237
.toSet
238238

239-
val allTransitiveClassMethods = allTransitiveClasses
239+
val allTransitiveClassMethods: Map[Class[?], Map[String, java.lang.reflect.Method]] = allTransitiveClasses
240240
.map { cls =>
241241
val cMangledName = cls.getName.replace('.', '$')
242242
cls -> cls.getDeclaredMethods

main/server/src/mill/main/server/Server.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ abstract class Server[T](
5555
serverLog("handling run")
5656
try handleRun(sock, initialSystemProperties)
5757
catch {
58-
case e: Throwable => serverLog(e + "\n" + e.getStackTrace.mkString("\n"))
58+
case e: Throwable => serverLog(e.toString + "\n" + e.getStackTrace.mkString("\n"))
5959
} finally sock.close();
6060
true
6161
}

0 commit comments

Comments
 (0)