diff options
| author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-10-20 18:03:48 -0700 |
|---|---|---|
| committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-10-20 18:03:48 -0700 |
| commit | 9dbb0675352a36965c556b678bec2b1ffc3d2e45 (patch) | |
| tree | 4314e6eed3f9602de0877960a5be39e5f2515fd0 /test/files/neg | |
| parent | caa1b7b4b0ae7af2eb4cafe0ef27d06be17cbcf5 (diff) | |
| parent | ed09630a9846cb5dfbc42229f0c9a397254ce401 (diff) | |
| download | scala-9dbb0675352a36965c556b678bec2b1ffc3d2e45.tar.gz scala-9dbb0675352a36965c556b678bec2b1ffc3d2e45.tar.bz2 scala-9dbb0675352a36965c556b678bec2b1ffc3d2e45.zip | |
Merge pull request #1508 from hubertp/2.10.x-issue/6358
Backport commits that fix SI-6358 from master
Diffstat (limited to 'test/files/neg')
| -rw-r--r-- | test/files/neg/valueclasses-impl-restrictions.check | 12 | ||||
| -rw-r--r-- | test/files/neg/valueclasses-impl-restrictions.scala | 1 |
2 files changed, 4 insertions, 9 deletions
diff --git a/test/files/neg/valueclasses-impl-restrictions.check b/test/files/neg/valueclasses-impl-restrictions.check index 17d07ba960..63924493aa 100644 --- a/test/files/neg/valueclasses-impl-restrictions.check +++ b/test/files/neg/valueclasses-impl-restrictions.check @@ -2,20 +2,16 @@ valueclasses-impl-restrictions.scala:3: error: implementation restriction: neste This restriction is planned to be removed in subsequent releases. object X ^ -valueclasses-impl-restrictions.scala:4: error: implementation restriction: lazy val is not allowed in value class -This restriction is planned to be removed in subsequent releases. - lazy val y = 1 - ^ -valueclasses-impl-restrictions.scala:10: error: implementation restriction: nested trait is not allowed in value class +valueclasses-impl-restrictions.scala:9: error: implementation restriction: nested trait is not allowed in value class This restriction is planned to be removed in subsequent releases. trait I2 { ^ -valueclasses-impl-restrictions.scala:16: error: implementation restriction: nested class is not allowed in value class +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:22: error: implementation restriction: nested class is not allowed in value class +valueclasses-impl-restrictions.scala:21: 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) ^ -5 errors found +four errors found diff --git a/test/files/neg/valueclasses-impl-restrictions.scala b/test/files/neg/valueclasses-impl-restrictions.scala index 53396db958..137f3f854c 100644 --- a/test/files/neg/valueclasses-impl-restrictions.scala +++ b/test/files/neg/valueclasses-impl-restrictions.scala @@ -1,7 +1,6 @@ class M(val t: Int) extends AnyVal { def lazyString = { object X - lazy val y = 1 () => X } } |