syntax fix after rebase

com-lihaoyi · Aug 22, 2024 · e69f1bd · e69f1bd
1 parent ab87d07
commit e69f1bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/main/eval/src/mill/eval/EvaluatorCore.scala b/main/eval/src/mill/eval/EvaluatorCore.scala
@@ -224,10 +224,10 @@ private[mill] trait EvaluatorCore extends GroupEvaluator {
         c.getInterfaces.iterator.flatMap(resolveTransitiveParents)
     }
 
-    val classToTransitiveClasses = sortedGroups
+    val classToTransitiveClasses: Map[Class[?], IndexedSeq[Class[?]]] = sortedGroups
       .values()
       .flatten
-      .collect { case namedTask: NamedTask[_] => namedTask.ctx.enclosingCls }
+      .collect { case namedTask: NamedTask[?] => namedTask.ctx.enclosingCls }
       .map(cls => cls -> resolveTransitiveParents(cls).toVector)
       .toMap
 
@@ -236,7 +236,7 @@ private[mill] trait EvaluatorCore extends GroupEvaluator {
       .flatMap(_._2)
       .toSet
 
-    val allTransitiveClassMethods = allTransitiveClasses
+    val allTransitiveClassMethods: Map[Class[?], Map[String, java.lang.reflect.Method]] = allTransitiveClasses
       .map { cls =>
         val cMangledName = cls.getName.replace('.', '$')
         cls -> cls.getDeclaredMethods

diff --git a/main/server/src/mill/main/server/Server.scala b/main/server/src/mill/main/server/Server.scala
@@ -55,7 +55,7 @@ abstract class Server[T](
                   serverLog("handling run")
                   try handleRun(sock, initialSystemProperties)
                   catch {
-                    case e: Throwable => serverLog(e + "\n" + e.getStackTrace.mkString("\n"))
+                    case e: Throwable => serverLog(e.toString + "\n" + e.getStackTrace.mkString("\n"))
                   } finally sock.close();
                   true
               }