aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/typer/ErrorReporting.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2014-09-21 14:50:45 +0200
committerDmitry Petrashko <dmitry.petrashko@gmail.com>2014-10-11 08:24:36 +0200
commit3f542aabf7944cc36302753d6126bb06e571d218 (patch)
treef5d6cb82cb27ec2e83ec410d7c734f701804f124 /src/dotty/tools/dotc/typer/ErrorReporting.scala
parentd32ff05d101f860dc1b290330d34caa9aea6e1df (diff)
downloaddotty-3f542aabf7944cc36302753d6126bb06e571d218.tar.gz
dotty-3f542aabf7944cc36302753d6126bb06e571d218.tar.bz2
dotty-3f542aabf7944cc36302753d6126bb06e571d218.zip
Account for PolyProto and IgnoredProto types in expectedTypeStr
Diffstat (limited to 'src/dotty/tools/dotc/typer/ErrorReporting.scala')
-rw-r--r--src/dotty/tools/dotc/typer/ErrorReporting.scala6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/typer/ErrorReporting.scala b/src/dotty/tools/dotc/typer/ErrorReporting.scala
index 1f55df2bc..e96e04b1a 100644
--- a/src/dotty/tools/dotc/typer/ErrorReporting.scala
+++ b/src/dotty/tools/dotc/typer/ErrorReporting.scala
@@ -56,10 +56,12 @@ object ErrorReporting {
else ""
def expectedTypeStr(tp: Type): String = tp match {
+ case tp: PolyProto =>
+ d"type arguments [${tp.targs}%, %] and ${expectedTypeStr(tp.resultType)}"
case tp: FunProto =>
val result = tp.resultType match {
- case tp: WildcardType => ""
- case tp => d"and expected result type $tp"
+ case _: WildcardType | _: IgnoredProto => ""
+ case tp => d" and expected result type $tp"
}
d"arguments (${tp.typedArgs.tpes}%, %)$result"
case _ =>