summaryrefslogtreecommitdiff
path: root/test/files/specialized
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-03-14 10:25:59 -0700
committerPaul Phillips <paulp@improving.org>2012-03-14 12:24:34 -0700
commit55990c9ec619cf212a31db4f818dedb5d3150157 (patch)
tree8a4247660a833881bdc9fe2e2c6f38ff3fbcb158 /test/files/specialized
parent3ab383ae01a66208df4955bf2117dd2ea8eb2afe (diff)
downloadscala-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/specialized')
-rw-r--r--test/files/specialized/SI-5005.check4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/specialized/SI-5005.check b/test/files/specialized/SI-5005.check
index d2a97512ae..9fc63a2b1d 100644
--- a/test/files/specialized/SI-5005.check
+++ b/test/files/specialized/SI-5005.check
@@ -1,6 +1,6 @@
[[syntax trees at end of specialize]]// Scala source: newSource1
package <empty> {
- class C2[@specialized(scala.Boolean) U >: Nothing <: Any] extends Object with ScalaObject {
+ class C2[@specialized(scala.Boolean) U >: Nothing <: Any] extends Object {
def <init>(): C2[U] = {
C2.super.<init>();
()
@@ -8,7 +8,7 @@ package <empty> {
def apply(x: U): U = x;
<specialized> def apply$mcZ$sp(x: Boolean): Boolean = C2.this.apply(x.asInstanceOf[U]()).asInstanceOf[Boolean]()
};
- class B extends Object with ScalaObject {
+ class B extends Object {
def <init>(): B = {
B.super.<init>();
()