diff options
| author | Paul Phillips <paulp@improving.org> | 2012-03-14 10:25:59 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-03-14 12:24:34 -0700 |
| commit | 55990c9ec619cf212a31db4f818dedb5d3150157 (patch) | |
| tree | 8a4247660a833881bdc9fe2e2c6f38ff3fbcb158 /test/files/neg | |
| parent | 3ab383ae01a66208df4955bf2117dd2ea8eb2afe (diff) | |
| download | scala-55990c9ec619cf212a31db4f818dedb5d3150157.tar.gz scala-55990c9ec619cf212a31db4f818dedb5d3150157.tar.bz2 scala-55990c9ec619cf212a31db4f818dedb5d3150157.zip | |
New starr to support new fundamental laws of reality.
And grueling recovery from branch drift.
Merges a portion (and only a portion) of topic/inline into master.
The major changes which come with this merge are:
AnyVal is unsealed, can be extended directly.
ScalaObject is no longer with us.
Diffstat (limited to 'test/files/neg')
| -rw-r--r-- | test/files/neg/anyval-children-2.check | 2 | ||||
| -rw-r--r-- | test/files/neg/t5529.check | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/test/files/neg/anyval-children-2.check b/test/files/neg/anyval-children-2.check index cb327faeeb..a88682ea93 100644 --- a/test/files/neg/anyval-children-2.check +++ b/test/files/neg/anyval-children-2.check @@ -1,4 +1,4 @@ -anyval-children-2.scala:1: error: Only @inline classes (not traits) are allowed to extend AnyVal +anyval-children-2.scala:1: error: Only classes (not traits) are allowed to extend AnyVal @inline trait NotOkDingus1 extends AnyVal // fail ^ one error found diff --git a/test/files/neg/t5529.check b/test/files/neg/t5529.check index 78a26aeb50..5d2175fa79 100644 --- a/test/files/neg/t5529.check +++ b/test/files/neg/t5529.check @@ -4,9 +4,7 @@ t5529.scala:12: error: File is already defined as class File t5529.scala:10: error: class type required but test.Test.File found sealed class Dir extends File { } ^ -t5529.scala:10: error: illegal inheritance; super<none> - is not a subclass of the superclass Object - of the mixin trait ScalaObject +t5529.scala:10: error: test.Test.File does not have a constructor sealed class Dir extends File { } ^ three errors found |