From e69f1bd15b43072c0442737b0bc2145c50e1f043 Mon Sep 17 00:00:00 2001
From: Jamie Thompson <bishbashboshjt@gmail.com>
Date: Thu, 22 Aug 2024 08:43:26 +0200
Subject: [PATCH] syntax fix after rebase

---
 main/eval/src/mill/eval/EvaluatorCore.scala   | 6 +++---
 main/server/src/mill/main/server/Server.scala | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/eval/src/mill/eval/EvaluatorCore.scala b/main/eval/src/mill/eval/EvaluatorCore.scala
index 34d5927eaa9..f44ba28aea3 100644
--- 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
index 588b1533dac..b23f8920a3c 100644
--- 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
               }