diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-05-17 17:01:20 +0200 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-05-17 11:16:39 -0700 |
| commit | b7c352a57f65458c66c78a368f75aaaa4a08e443 (patch) | |
| tree | 4b2b7fcea439948c5de65b05a392091a66eea0a4 /test/files/neg/gadts1.check | |
| parent | 4f8c306aca703c63282295c9f74f0cb35f9f85d4 (diff) | |
| parent | be405eed9bef9736f0142d6ddf53b6bf8af08696 (diff) | |
| download | scala-b7c352a57f65458c66c78a368f75aaaa4a08e443.tar.gz scala-b7c352a57f65458c66c78a368f75aaaa4a08e443.tar.bz2 scala-b7c352a57f65458c66c78a368f75aaaa4a08e443.zip | |
Merge v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-master
================================================================
Merge commit 'v2.10.1-326-g4f8c306' into merge/v2.10.1-326-g4f8c306-to-master
Conflicts:
src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
src/reflect/scala/reflect/runtime/JavaMirrors.scala
================================================================
Merge -s ours 4e64a27 ([nomaster commit range])
================================================================
Merge commit '0ae7e55' into merge/v2.10.1-326-g4f8c306-to-master
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Macros.scala
Diffstat (limited to 'test/files/neg/gadts1.check')
| -rw-r--r-- | test/files/neg/gadts1.check | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/test/files/neg/gadts1.check b/test/files/neg/gadts1.check index a5e3e0de10..9b7ea5556a 100644 --- a/test/files/neg/gadts1.check +++ b/test/files/neg/gadts1.check @@ -1,8 +1,3 @@ -gadts1.scala:15: error: type mismatch; - found : Test.Double - required: a - case NumTerm(n) => c.x = Double(1.0) - ^ gadts1.scala:20: error: Test.Cell[a] does not take parameters case Cell[a](x: Int) => c.x = 5 ^ @@ -11,4 +6,4 @@ gadts1.scala:20: error: type mismatch; required: a case Cell[a](x: Int) => c.x = 5 ^ -three errors found +two errors found |