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/run/t1195.check | |
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/run/t1195.check')
-rw-r--r-- | test/files/run/t1195.check | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/files/run/t1195.check b/test/files/run/t1195.check index dc521fb8ca..1214d0c4b5 100644 --- a/test/files/run/t1195.check +++ b/test/files/run/t1195.check @@ -1,6 +1,6 @@ -_ <: scala.runtime.AbstractFunction1[Int, _ <: Object with scala.ScalaObject with scala.Product with scala.Serializable] with scala.ScalaObject with scala.Serializable with java.lang.Object -_ <: Object with scala.ScalaObject with scala.Product with scala.Serializable -Object with scala.ScalaObject with scala.Product with scala.Serializable -_ <: scala.runtime.AbstractFunction1[Int, _ <: Object with scala.ScalaObject with scala.Product with scala.Serializable] with scala.ScalaObject with scala.Serializable with java.lang.Object -_ <: Object with scala.ScalaObject with scala.Product with scala.Serializable -Object with scala.ScalaObject with scala.Product with scala.Serializable +_ <: scala.runtime.AbstractFunction1[Int, _ <: Object with scala.Product with scala.Serializable with Object] with scala.Serializable with java.lang.Object +_ <: Object with scala.Product with scala.Serializable with Object +Object with scala.Product with scala.Serializable +_ <: scala.runtime.AbstractFunction1[Int, _ <: Object with scala.Product with scala.Serializable with Object] with scala.Serializable with java.lang.Object +_ <: Object with scala.Product with scala.Serializable with Object +Object with scala.Product with scala.Serializable |