diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-06-28 12:09:21 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-06-28 14:23:15 -0700 |
commit | e320a920d4c32752157cf73be5a5fbbd3b9cc6e7 (patch) | |
tree | 04d2e78365d257c055c56ea93aaf88f9c0b9f3f9 /test/files/neg | |
parent | 397a057fd242833098562e48f12e11621b4ab7ae (diff) | |
parent | d22e8d282c538a711f6fdd33793c06cd7676959d (diff) | |
download | scala-e320a920d4c32752157cf73be5a5fbbd3b9cc6e7.tar.gz scala-e320a920d4c32752157cf73be5a5fbbd3b9cc6e7.tar.bz2 scala-e320a920d4c32752157cf73be5a5fbbd3b9cc6e7.zip |
Merge 2.10.x into master
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Duplicators.scala
src/library/scala/concurrent/Future.scala
test/files/jvm/scala-concurrent-tck.scala
Diffstat (limited to 'test/files/neg')
-rw-r--r-- | test/files/neg/valueclasses-impl-restrictions.check | 8 | ||||
-rw-r--r-- | test/files/neg/valueclasses-impl-restrictions.scala | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/test/files/neg/valueclasses-impl-restrictions.check b/test/files/neg/valueclasses-impl-restrictions.check index 63924493aa..0af9173f74 100644 --- a/test/files/neg/valueclasses-impl-restrictions.check +++ b/test/files/neg/valueclasses-impl-restrictions.check @@ -6,12 +6,8 @@ valueclasses-impl-restrictions.scala:9: error: implementation restriction: neste This restriction is planned to be removed in subsequent releases. trait I2 { ^ -valueclasses-impl-restrictions.scala:15: error: implementation restriction: nested class is not allowed in value class -This restriction is planned to be removed in subsequent releases. - val i2 = new I2 { val q = x.s } - ^ -valueclasses-impl-restrictions.scala:21: error: implementation restriction: nested class is not allowed in value class +valueclasses-impl-restrictions.scala:23: error: implementation restriction: nested class is not allowed in value class This restriction is planned to be removed in subsequent releases. private[this] class I2(val q: String) ^ -four errors found +three errors found diff --git a/test/files/neg/valueclasses-impl-restrictions.scala b/test/files/neg/valueclasses-impl-restrictions.scala index 137f3f854c..f0577a94aa 100644 --- a/test/files/neg/valueclasses-impl-restrictions.scala +++ b/test/files/neg/valueclasses-impl-restrictions.scala @@ -12,8 +12,10 @@ class X1(val s: String) extends AnyVal { } def y(x: X1) = { - val i2 = new I2 { val q = x.s } + val i2 = new I2 { val q = x.s } // allowed as of SI-7571 i2.z + + { case x => x } : PartialFunction[Int, Int] // allowed } } |