summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-11-04 13:07:05 -0800
committerPaul Phillips <paulp@improving.org>2012-11-04 13:07:05 -0800
commit3d248efcc1925acb7f73b2b2db2184f8d33b68ad (patch)
tree161086d04159db62e8ece2d28697e022111f9530 /test/files/neg
parent2c6777fd53b93b95a261aadc87a5cbc03c14d503 (diff)
parentc04a4edcac9e6ecf653159942394a82d579f1f88 (diff)
downloadscala-3d248efcc1925acb7f73b2b2db2184f8d33b68ad.tar.gz
scala-3d248efcc1925acb7f73b2b2db2184f8d33b68ad.tar.bz2
scala-3d248efcc1925acb7f73b2b2db2184f8d33b68ad.zip
Merge pull request #1554 from paulp/scope-lookup
Improvements to scope lookup.
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/dbldef.check4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/files/neg/dbldef.check b/test/files/neg/dbldef.check
index 3ee63475e4..b896c4cdcf 100644
--- a/test/files/neg/dbldef.check
+++ b/test/files/neg/dbldef.check
@@ -6,9 +6,7 @@ dbldef.scala:1: error: type mismatch;
required: Int
case class test0(x: Int, x: Float)
^
-dbldef.scala:1: error: type mismatch;
- found : Float
- required: Int
+dbldef.scala:1: error: in class test0, multiple overloaded alternatives of x define default arguments
case class test0(x: Int, x: Float)
^
three errors found