Drop {method,val}Name from cyclic errors

Author: Blaisorblade

compiler/src/dotty/tools/dotc/core/TypeErrors.scala

@@ -125,11 +125,11 @@ class CyclicReference private (val denot: SymDenotation) extends TypeError {
         cx.tree match {
           case tree: untpd.ValOrDefDef if !tree.tpt.typeOpt.exists =>
             if (inImplicitSearch)
-              TermMemberNeedsResultTypeForImplicitSearch(tree.name, cycleSym)
+              TermMemberNeedsResultTypeForImplicitSearch(cycleSym)
             else if (isMethod)
-              OverloadedOrRecursiveMethodNeedsResultType(tree.name, cycleSym)
+              OverloadedOrRecursiveMethodNeedsResultType(cycleSym)
             else if (isVal)
-              RecursiveValueNeedsResultType(tree.name, cycleSym)
+              RecursiveValueNeedsResultType(cycleSym)
             else
               errorMsg(cx.outer)
           case _ =>

compiler/src/dotty/tools/dotc/reporting/diagnostic/messages.scala

@@ -1260,7 +1260,7 @@ object messages {
            |""".stripMargin
   }
 
-  case class OverloadedOrRecursiveMethodNeedsResultType(methodName: Names.TermName, cycleSym: Symbol)(implicit ctx: Context)
+  case class OverloadedOrRecursiveMethodNeedsResultType(cycleSym: Symbol)(implicit ctx: Context)
   extends Message(OverloadedOrRecursiveMethodNeedsResultTypeID) {
     val kind = "Syntax"
     val msg = hl"""overloaded or recursive $cycleSym needs return type"""
@@ -1275,7 +1275,7 @@ object messages {
           |""".stripMargin
   }
 
-  case class RecursiveValueNeedsResultType(valName: Names.TermName, cycleSym: Symbol)(implicit ctx: Context)
+  case class RecursiveValueNeedsResultType(cycleSym: Symbol)(implicit ctx: Context)
   extends Message(RecursiveValueNeedsResultTypeID) {
     val kind = "Syntax"
     val msg = hl"""recursive $cycleSym needs type"""
@@ -2111,7 +2111,7 @@ object messages {
   }
 
   // Relative of CyclicReferenceInvolvingImplicit and RecursiveValueNeedsResultType
-  case class TermMemberNeedsResultTypeForImplicitSearch(memberName: Names.TermName, cycleSym: Symbol)(implicit ctx: Context)
+  case class TermMemberNeedsResultTypeForImplicitSearch(cycleSym: Symbol)(implicit ctx: Context)
     extends Message(TermMemberNeedsNeedsResultTypeForImplicitSearchID) {
     val kind = "Syntax"
     val msg = hl"""$cycleSym needs result type because its right-hand side attempts implicit search"""

compiler/test/dotty/tools/dotc/reporting/ErrorMessagesTests.scala

@@ -207,8 +207,7 @@ class ErrorMessagesTests extends ErrorMessagesTest {
       implicit val ctx: Context = ictx
 
       assertMessageCount(1, messages)
-      val OverloadedOrRecursiveMethodNeedsResultType(methodName, cycleSym) :: Nil = messages
-      assertEquals("foo", methodName.show)
+      val OverloadedOrRecursiveMethodNeedsResultType(cycleSym) :: Nil = messages
       assertEquals("foo", cycleSym.name.show)
     }
 
@@ -224,8 +223,7 @@ class ErrorMessagesTests extends ErrorMessagesTest {
       implicit val ctx: Context = ictx
 
       assertMessageCount(1, messages)
-      val OverloadedOrRecursiveMethodNeedsResultType(methodName, cycleSym) :: Nil = messages
-      assertEquals("i", methodName.show)
+      val OverloadedOrRecursiveMethodNeedsResultType(cycleSym) :: Nil = messages
       assertEquals("i", cycleSym.name.show)
     }
 
@@ -241,8 +239,7 @@ class ErrorMessagesTests extends ErrorMessagesTest {
       implicit val ctx: Context = ictx
 
       assertMessageCount(1, messages)
-      val RecursiveValueNeedsResultType(valName, cycleSym) :: Nil = messages
-      assertEquals("i", valName.show)
+      val RecursiveValueNeedsResultType(cycleSym) :: Nil = messages
       assertEquals("i", cycleSym.name.show)
     }
 
@@ -259,8 +256,7 @@ class ErrorMessagesTests extends ErrorMessagesTest {
         implicit val ctx: Context = ictx
 
         assertMessageCount(1, messages)
-        val RecursiveValueNeedsResultType(valName, cycleSym) :: Nil = messages
-        assertEquals("j", valName.show)
+        val RecursiveValueNeedsResultType(cycleSym) :: Nil = messages
         assertEquals("i", cycleSym.name.show)
       }
 
@@ -311,8 +307,7 @@ class ErrorMessagesTests extends ErrorMessagesTest {
         implicit val ctx: Context = ictx
 
         assertMessageCount(1, messages)
-        val OverloadedOrRecursiveMethodNeedsResultType(methodName, cycleSym) :: Nil = messages
-        assertEquals("even", methodName.show)
+        val OverloadedOrRecursiveMethodNeedsResultType(cycleSym) :: Nil = messages
         assertEquals("odd", cycleSym.name.show)
       }
 
@@ -334,9 +329,7 @@ class ErrorMessagesTests extends ErrorMessagesTest {
         implicit val ctx: Context = ictx
 
         assertMessageCount(1, messages)
-        val OverloadedOrRecursiveMethodNeedsResultType(methodName, cycleSym) :: Nil = messages
-        // Not ideal behavior
-        assertEquals("foo", methodName.show)
+        val OverloadedOrRecursiveMethodNeedsResultType(cycleSym) :: Nil = messages
         assertEquals("odd", cycleSym.name.show)
       }
 
@@ -358,9 +351,7 @@ class ErrorMessagesTests extends ErrorMessagesTest {
         implicit val ctx: Context = ictx
 
         assertMessageCount(1, messages)
-        val OverloadedOrRecursiveMethodNeedsResultType(methodName, cycleSym) :: Nil = messages
-        // Not ideal behavior
-        assertEquals("foo", methodName.show)
+        val OverloadedOrRecursiveMethodNeedsResultType(cycleSym) :: Nil = messages
         assertEquals("odd", cycleSym.name.show)
       }
 
@@ -380,9 +371,8 @@ class ErrorMessagesTests extends ErrorMessagesTest {
       implicit val ctx: Context = ictx
 
       assertMessageCount(1, messages)
-      val TermMemberNeedsResultTypeForImplicitSearch(memberName, cycleSym) :: Nil = messages
+      val TermMemberNeedsResultTypeForImplicitSearch(cycleSym) :: Nil = messages
       assertEquals("x", cycleSym.name.show)
-      assertEquals("x", memberName.show)
     }
 
   @Test def implicitSearchForcesImplicitRetType_i4709 =
@@ -406,8 +396,7 @@ class ErrorMessagesTests extends ErrorMessagesTest {
       implicit val ctx: Context = ictx
 
       assertMessageCount(1, messages)
-      val TermMemberNeedsResultTypeForImplicitSearch(memberName, cycleSym) :: Nil = messages
-      assertEquals("ctx", memberName.show)
+      val TermMemberNeedsResultTypeForImplicitSearch(cycleSym) :: Nil = messages
       assertEquals("ctx", cycleSym.name.show)
     }
 
@@ -425,8 +414,7 @@ class ErrorMessagesTests extends ErrorMessagesTest {
         implicit val ctx: Context = ictx
 
         assertMessageCount(1, messages)
-        val TermMemberNeedsResultTypeForImplicitSearch(memberName, cycleSym) :: Nil = messages
-        assertEquals("test", memberName.show)
+        val TermMemberNeedsResultTypeForImplicitSearch(cycleSym) :: Nil = messages
         assertEquals("test", cycleSym.name.show)
       }