diff options
| author | Paul Phillips <paulp@improving.org> | 2012-10-07 15:20:51 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-10-07 15:20:51 -0700 |
| commit | a5a1f01b7d458b94e37407681abb3334a543fb03 (patch) | |
| tree | 93ddf4e9ed05e4108f1b9d82a0960c516b1c3e77 /test/files/neg/t5882.check | |
| parent | 7be1652cbf1300fe5fea44681a480c33467c2296 (diff) | |
| parent | 65a321c63e5ddb77fa87de098c4f7d6f9ce8baa6 (diff) | |
| download | scala-a5a1f01b7d458b94e37407681abb3334a543fb03.tar.gz scala-a5a1f01b7d458b94e37407681abb3334a543fb03.tar.bz2 scala-a5a1f01b7d458b94e37407681abb3334a543fb03.zip | |
Merge remote-tracking branch 'origin/2.10.0-wip' into merge-2.10
* origin/2.10.0-wip:
MethodSymbol.params => MethodSymbol.paramss
SI-6471 Update jquery from 1.4.2 to 1.8.2
undeprecates manifests for 2.10.0
SI-6451: Rename classes in `unchecked-abstract.scala` test.
Put more implementation restrictions on value classes.
Fixed problem in SI-6408
Revised restrictions for value classes and unversal traits
SI-6436 Handle ambiguous string processors
fixes a bug in a weak cache in runtime reflection
Conflicts:
test/files/neg/classmanifests_new_deprecations.check
test/files/neg/unchecked-abstract.check
Diffstat (limited to 'test/files/neg/t5882.check')
| -rw-r--r-- | test/files/neg/t5882.check | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/test/files/neg/t5882.check b/test/files/neg/t5882.check index df01c7bc0a..e0958e19d9 100644 --- a/test/files/neg/t5882.check +++ b/test/files/neg/t5882.check @@ -1,15 +1,9 @@ -t5882.scala:2: warning: case classes without a parameter list have been deprecated; -use either case objects or case classes with `()' as parameter list. - case class Scope - ^ -t5882.scala:2: error: value class may not have nested class definitions - case class Scope +t5882.scala:4: error: implementation restriction: nested class is not allowed in value class +This restriction is planned to be removed in subsequent releases. + case class Scope() ^ -t5882.scala:3: error: value class may not have nested class definitions - class Foo - ^ -t5882.scala:4: error: value class may not have nested module definitions +t5882.scala:5: error: implementation restriction: nested object is not allowed in value class +This restriction is planned to be removed in subsequent releases. object Bar ^ -one warning found -three errors found +two errors found |