diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-20 22:46:08 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-20 22:48:34 -0800 |
| commit | 9712cd07ea5bd9acd34d4e7f5ba2180dbdee7fee (patch) | |
| tree | f432c928c34d95ed3a434cf0673828282d93bd5a /src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala | |
| parent | 70956e560a11996e1d801d59b312dfe9d56b7a74 (diff) | |
| parent | 2952d0fa020c003e919dff0eea0bc63f7d52fba8 (diff) | |
| download | scala-9712cd07ea5bd9acd34d4e7f5ba2180dbdee7fee.tar.gz scala-9712cd07ea5bd9acd34d4e7f5ba2180dbdee7fee.tar.bz2 scala-9712cd07ea5bd9acd34d4e7f5ba2180dbdee7fee.zip | |
Merge 2.10.x into master.
Conflicts:
build.number
src/compiler/scala/tools/nsc/doc/base/MemberLookupBase.scala
src/compiler/scala/tools/nsc/typechecker/Macros.scala
test/files/presentation/doc/doc.scala
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala b/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala index cfe962d65f..81ea5630d0 100644 --- a/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala +++ b/src/compiler/scala/tools/nsc/typechecker/TypeDiagnostics.scala @@ -101,14 +101,9 @@ trait TypeDiagnostics { "\n(Note that variables need to be initialized to be defined)" else "" - /** Only prints the parameter names if they're not synthetic, - * since "x$1: Int" does not offer any more information than "Int". - */ private def methodTypeErrorString(tp: Type) = tp match { case mt @ MethodType(params, resultType) => - def forString = - if (params exists (_.isSynthetic)) params map (_.tpe) - else params map (_.defString) + def forString = params map (_.defString) forString.mkString("(", ",", ")") + resultType case x => x.toString |