Merge pull request #600 from smarter/fix/overriden-message

DarkDimius · DarkDimius · commit 14051fb457a3 · 2015-05-23T18:51:27.000+02:00
Fix #597: Improve double def error message
diff --git a/src/dotty/tools/dotc/typer/Checking.scala b/src/dotty/tools/dotc/typer/Checking.scala
@@ -313,7 +313,7 @@ trait Checking {
             def ofType = if (decl.isType) "" else d": ${other.info}"
             def explanation =
               if (!decl.isRealMethod) ""
-              else "\n (both definitions have the same erased type signature)"
+              else "\n (the definitions have matching type signatures)"
             ctx.error(d"$decl is already defined as $other$ofType$explanation", decl.pos)
           }
           if (decl is Synthetic) doubleDefError(other, decl)

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ trait Checking {`
`313`	`313`	`def ofType = if (decl.isType) "" else d": ${other.info}"`
`314`	`314`	`def explanation =`
`315`	`315`	`if (!decl.isRealMethod) ""`
`316`		`- else "\n (both definitions have the same erased type signature)"`
	`316`	`+ else "\n (the definitions have matching type signatures)"`
`317`	`317`	`ctx.error(d"$decl is already defined as $other$ofType$explanation", decl.pos)`
`318`	`318`	`}`
`319`	`319`	`if (decl is Synthetic) doubleDefError(other, decl)`