diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-10-14 00:12:51 +0200 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-10-14 00:12:51 +0200 |
| commit | b126e5c31b2bc57df5d0d5cf3508babe1dd7a759 (patch) | |
| tree | e1c71882fe860ac0bdd1f79b0ec45757a7c888be /test/files/neg/typeerror.check | |
| parent | 71d4e285064e9d3475a0badecf283ea95166df6d (diff) | |
| parent | 392d1ddb1588d69c2e8ae10a2b3e902c7229b772 (diff) | |
| download | scala-b126e5c31b2bc57df5d0d5cf3508babe1dd7a759.tar.gz scala-b126e5c31b2bc57df5d0d5cf3508babe1dd7a759.tar.bz2 scala-b126e5c31b2bc57df5d0d5cf3508babe1dd7a759.zip | |
Merge remote-tracking branch 'scala/master' into fix-merge-3018
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Typers.scala
Diffstat (limited to 'test/files/neg/typeerror.check')
| -rw-r--r-- | test/files/neg/typeerror.check | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/files/neg/typeerror.check b/test/files/neg/typeerror.check index 3ce11dad8a..f117e702f0 100644 --- a/test/files/neg/typeerror.check +++ b/test/files/neg/typeerror.check @@ -3,4 +3,9 @@ typeerror.scala:6: error: type mismatch; required: scala.Long else add2(x.head, y.head) :: add(x.tail, y.tail) ^ -one error found +typeerror.scala:6: error: type mismatch; + found : Long(in method add) + required: scala.Long + else add2(x.head, y.head) :: add(x.tail, y.tail) + ^ +two errors found |