diff options
| author | Paul Phillips <paulp@improving.org> | 2012-04-30 09:42:03 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-04-30 09:42:03 -0700 |
| commit | cfd037271ebf96b977d4ef06dbcd7814cfcc20a0 (patch) | |
| tree | 01bb91c3000d78d1071747599cf6b081825afda2 /test/files | |
| parent | 23764a123a9fb1ef1315fe6cb89b904f391a127c (diff) | |
| parent | 1d7430c7d574f02ea88ed8e1b5394e8986be5618 (diff) | |
| download | scala-cfd037271ebf96b977d4ef06dbcd7814cfcc20a0.tar.gz scala-cfd037271ebf96b977d4ef06dbcd7814cfcc20a0.tar.bz2 scala-cfd037271ebf96b977d4ef06dbcd7814cfcc20a0.zip | |
Merge branch 'apr30-checkin' of /scala/trunk into develop
Diffstat (limited to 'test/files')
| -rw-r--r-- | test/files/neg/t900.check | 4 | ||||
| -rw-r--r-- | test/files/run/tuple-zipped.scala | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/files/neg/t900.check b/test/files/neg/t900.check index 047094ad6e..4611ceba8c 100644 --- a/test/files/neg/t900.check +++ b/test/files/neg/t900.check @@ -2,8 +2,8 @@ t900.scala:4: error: type mismatch; found : Foo.this.x.type (with underlying type Foo.this.bar) required: AnyRef Note that implicit conversions are not applicable because they are ambiguous: - both method any2stringadd in object Predef of type (x: Any)scala.runtime.StringAdd - and method any2stringfmt in object Predef of type (x: Any)scala.runtime.StringFormat + both method any2stringfmt in object Predef of type (x: Any)scala.runtime.StringFormat + and method any2stringadd in object Predef of type (x: Any)scala.runtime.StringAdd are possible conversion functions from Foo.this.x.type to AnyRef def break(): x.type ^ diff --git a/test/files/run/tuple-zipped.scala b/test/files/run/tuple-zipped.scala index a9851346bc..b197183844 100644 --- a/test/files/run/tuple-zipped.scala +++ b/test/files/run/tuple-zipped.scala @@ -15,14 +15,14 @@ object Test { def main(args: Array[String]): Unit = { for (cc1 <- xss1 ; cc2 <- xss2) { - val sum1 = (cc1, cc2).zip map { case (x, y) => x + y } sum + val sum1 = (cc1, cc2).zipped map { case (x, y) => x + y } sum val sum2 = (cc1, cc2).zipped map (_ + _) sum assert(sum1 == sum2) } for (cc1 <- xss1 ; cc2 <- xss2 ; cc3 <- xss3) { - val sum1 = (cc1, cc2, cc3).zip map { case (x, y, z) => x + y + z } sum + val sum1 = (cc1, cc2, cc3).zipped map { case (x, y, z) => x + y + z } sum val sum2 = (cc1, cc2, cc3).zipped map (_ + _ + _) sum assert(sum1 == sum2) |